[Fai-commit] r5677 - in people/shermann/fai-ubuntu-trunk: conf debian examples/simple/class examples/simple/package_config examples/simple/scripts/GRUB_PC
Stephan Hermann
shermann-guest at alioth.debian.org
Tue Nov 17 15:21:54 UTC 2009
Author: shermann-guest
Date: 2009-11-17 15:21:54 +0000 (Tue, 17 Nov 2009)
New Revision: 5677
Added:
people/shermann/fai-ubuntu-trunk/examples/simple/package_config/faiclient
Modified:
people/shermann/fai-ubuntu-trunk/conf/NFSROOT
people/shermann/fai-ubuntu-trunk/conf/make-fai-nfsroot.conf
people/shermann/fai-ubuntu-trunk/conf/sources.list
people/shermann/fai-ubuntu-trunk/debian/changelog
people/shermann/fai-ubuntu-trunk/debian/control
people/shermann/fai-ubuntu-trunk/examples/simple/class/50-host-classes
people/shermann/fai-ubuntu-trunk/examples/simple/package_config/DEFAULT
people/shermann/fai-ubuntu-trunk/examples/simple/package_config/FAIBASE
people/shermann/fai-ubuntu-trunk/examples/simple/scripts/GRUB_PC/10-setup
Log:
Added changes to fai-ubuntu-trunk
Now this is in sync with fai/trunk
Modified: people/shermann/fai-ubuntu-trunk/conf/NFSROOT
===================================================================
--- people/shermann/fai-ubuntu-trunk/conf/NFSROOT 2009-11-17 15:07:55 UTC (rev 5676)
+++ people/shermann/fai-ubuntu-trunk/conf/NFSROOT 2009-11-17 15:21:54 UTC (rev 5677)
@@ -3,10 +3,9 @@
PACKAGES aptitude
nfs-common fai-nfsroot module-init-tools ssh rdate lshw portmap
rsync lftp less dump reiserfsprogs e2fsprogs usbutils
-hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
+psmisc pciutils hdparm smartmontools parted mdadm lvm2
dnsutils ntpdate dosfstools jove xfsprogs xfsdump
-procinfo dialog discover
-console-tools console-common
+procinfo dialog discover console-setup
iproute udev subversion liblinux-lvm-perl
# needed for the simple examples
@@ -17,11 +16,11 @@
PACKAGES aptitude I386
grub lilo read-edid
-linux-image-486 aufs-modules-2.6-486
+linux-image
PACKAGES aptitude AMD64
grub lilo
-linux-image-2.6-amd64 aufs-modules-2.6-amd64
+linux-image
PACKAGES aptitude IA64
elilo gnu-efi efibootmgr
@@ -33,5 +32,5 @@
aboot
PACKAGES aptitude POWERPC
-linux-image-2.6-powerpc aufs-modules-2.6-powerpc
+linux-image
yaboot
Modified: people/shermann/fai-ubuntu-trunk/conf/make-fai-nfsroot.conf
===================================================================
--- people/shermann/fai-ubuntu-trunk/conf/make-fai-nfsroot.conf 2009-11-17 15:07:55 UTC (rev 5676)
+++ people/shermann/fai-ubuntu-trunk/conf/make-fai-nfsroot.conf 2009-11-17 15:21:54 UTC (rev 5677)
@@ -16,7 +16,7 @@
#NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"
# Parameter for debootstrap: "<suite> <mirror>"
-FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian"
+FAI_DEBOOTSTRAP="karmic http://archive.ubuntu.com/ubuntu"
# the encrypted (with md5 or crypt) root password on all install clients during
# installation process; used when log in via ssh; default pw is: fai
Modified: people/shermann/fai-ubuntu-trunk/conf/sources.list
===================================================================
--- people/shermann/fai-ubuntu-trunk/conf/sources.list 2009-11-17 15:07:55 UTC (rev 5676)
+++ people/shermann/fai-ubuntu-trunk/conf/sources.list 2009-11-17 15:21:54 UTC (rev 5677)
@@ -1,8 +1,9 @@
# These lines should work for many sites
# A more comprehensive example is at /usr/share/doc/fai-doc/examples/etc
-deb http://cdn.debian.net/debian lenny main contrib non-free
-deb http://security.geo.debian.org/debian-security lenny/updates main contrib non-free
+deb http://archive.ubuntu.com/ubuntu karmic main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu karmic-security main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu karmic-updates main restricted universe multiverse
# repository that may contain newer fai packages for lenny
#deb http://www.informatik.uni-koeln.de/fai/download lenny koeln
Modified: people/shermann/fai-ubuntu-trunk/debian/changelog
===================================================================
--- people/shermann/fai-ubuntu-trunk/debian/changelog 2009-11-17 15:07:55 UTC (rev 5676)
+++ people/shermann/fai-ubuntu-trunk/debian/changelog 2009-11-17 15:21:54 UTC (rev 5677)
@@ -1,3 +1,19 @@
+fai (3.3.2ubuntu1) karmic; urgency=low
+
+ [ Stephan Hermann ]
+ * added changes from Waldemar Brodkorb to FAI 3.3.2 (LP: #338157)
+ + debian/control
+ + lib/load_keymap_consolchars: Merged from trunk rev5667
+ + conf/sources.list: adjusted deb lines to match Ubuntu mirrors
+ + conf/make-fai-nfsroot: adjusted deb mirror to match Ubuntu
+ + conf/NFSROOT: adjusted packages for Ubuntu (Thx Waldemar)
+ + examples/simple/class/50-host-class: added faiclient (Thx Waldemar)
+ + examples/simple/package_config/{DEFAULT, FAIBASE}: adjusted packages (Thx Waldemar)
+ + examples/simple/package_config/faiclient: Added
+ + examples/simple/scripts/GRUB_PC/10-setup: added source in dist_var.sh for softupdate (Thx Waldemar)
+
+ -- Stephan Hermann <shermann at wz-pc-010.intern.netviewer.de> Tue, 17 Nov 2009 16:15:17 +0100
+
fai (3.3.2) unstable; urgency=low
[ Thomas Lange ]
Modified: people/shermann/fai-ubuntu-trunk/debian/control
===================================================================
--- people/shermann/fai-ubuntu-trunk/debian/control 2009-11-17 15:07:55 UTC (rev 5676)
+++ people/shermann/fai-ubuntu-trunk/debian/control 2009-11-17 15:21:54 UTC (rev 5677)
@@ -42,7 +42,7 @@
Package: fai-server
Architecture: all
Depends: fai-client, debootstrap
-Recommends: nfs-kernel-server, dhcp3-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, iproute
+Recommends: nfs-kernel-server, dhcp3-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux | syslinux-common, openbsd-inetd | inet-superserver, iproute
Suggests: debmirror, apt-move, genisoimage, grub, aptitude, perl-tk, libproc-daemon-perl
Conflicts: fai
Replaces: fai
@@ -63,7 +63,7 @@
Package: fai-quickstart
Architecture: all
-Depends: fai-server, fai-doc, dhcp3-server, nfs-kernel-server, syslinux-common, tftpd-hpa, apt-move, genisoimage, openbsd-inetd | inet-superserver
+Depends: fai-server, fai-doc, dhcp3-server, nfs-kernel-server, syslinux | syslinux-common, tftpd-hpa, apt-move, genisoimage, openbsd-inetd | inet-superserver
Description: Fully Automatic Installation quickstart package
FAI is a non-interactive system to install, customize and manage
Linux systems and software configurations on computers as well as
Modified: people/shermann/fai-ubuntu-trunk/examples/simple/class/50-host-classes
===================================================================
--- people/shermann/fai-ubuntu-trunk/examples/simple/class/50-host-classes 2009-11-17 15:07:55 UTC (rev 5676)
+++ people/shermann/fai-ubuntu-trunk/examples/simple/class/50-host-classes 2009-11-17 15:21:54 UTC (rev 5677)
@@ -16,9 +16,11 @@
echo "FAIBASE DHCPC LVM_XEN_SERVER XEN" ;;
puma)
echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;
+ faiclient)
+ echo "FAIBASE DHCPC GERMAN" ;;
*)
echo "FAIBASE DHCPC" ;;
esac
-(ifclass I386 || ifclass AMD64) && echo GRUB
+(ifclass I386 || ifclass AMD64) && echo GRUB_PC
exit 0
Modified: people/shermann/fai-ubuntu-trunk/examples/simple/package_config/DEFAULT
===================================================================
--- people/shermann/fai-ubuntu-trunk/examples/simple/package_config/DEFAULT 2009-11-17 15:07:55 UTC (rev 5676)
+++ people/shermann/fai-ubuntu-trunk/examples/simple/package_config/DEFAULT 2009-11-17 15:21:54 UTC (rev 5677)
@@ -1,26 +1,11 @@
-PACKAGES aptitude I386
-linux-image-486
-memtest86+
-
-PACKAGES aptitude CHROOT
-linux-image-486-
-linux-image-amd64-
-
-PACKAGES aptitude AMD64
-linux-image-amd64
-memtest86+
-
-PACKAGES aptitude XEN
-xen-linux-system-2.6.26-2-xen-amd64
-
PACKAGES aptitude DHCPC
dhcp3-client
PACKAGES aptitude GRUB
-grub lilo-
+grub lilo- grub-pc-
PACKAGES aptitude GRUB_PC
grub-pc grub- lilo-
PACKAGES aptitude LILO
-lilo grub-
+lilo grub- grub-pc-
Modified: people/shermann/fai-ubuntu-trunk/examples/simple/package_config/FAIBASE
===================================================================
--- people/shermann/fai-ubuntu-trunk/examples/simple/package_config/FAIBASE 2009-11-17 15:07:55 UTC (rev 5676)
+++ people/shermann/fai-ubuntu-trunk/examples/simple/package_config/FAIBASE 2009-11-17 15:21:54 UTC (rev 5677)
@@ -7,7 +7,6 @@
hdparm
jove
less
-linuxlogo
nfs-common
nscd
rdate
@@ -20,6 +19,6 @@
exim4
eject
locales
-console-common
+console-setup
pciutils usbutils
lvm2
Added: people/shermann/fai-ubuntu-trunk/examples/simple/package_config/faiclient
===================================================================
--- people/shermann/fai-ubuntu-trunk/examples/simple/package_config/faiclient (rev 0)
+++ people/shermann/fai-ubuntu-trunk/examples/simple/package_config/faiclient 2009-11-17 15:21:54 UTC (rev 5677)
@@ -0,0 +1,3 @@
+PACKAGES aptitude
+linux-image
+
Modified: people/shermann/fai-ubuntu-trunk/examples/simple/scripts/GRUB_PC/10-setup
===================================================================
--- people/shermann/fai-ubuntu-trunk/examples/simple/scripts/GRUB_PC/10-setup 2009-11-17 15:07:55 UTC (rev 5676)
+++ people/shermann/fai-ubuntu-trunk/examples/simple/scripts/GRUB_PC/10-setup 2009-11-17 15:21:54 UTC (rev 5677)
@@ -2,6 +2,11 @@
error=0 ; trap "error=$((error|1))" ERR
+set -a
+
+# during softupdate use this file
+[ -r $LOGDIR/disk_var.sh ] && . $LOGDIR/disk_var.sh
+
$ROOTCMD grub-mkdevicemap -n -m /boot/grub/device.map
$ROOTCMD grub-mkconfig -o /boot/grub/grub.cfg
$ROOTCMD grub-install --no-floppy "(hd0)"
More information about the Fai-commit
mailing list