--- fai-3.2.4+svn4837.orig/conf/sources.list +++ fai-3.2.4+svn4837/conf/sources.list @@ -1,10 +1,12 @@ -# These lines should work for many sites +# These lines should work for installations of ubuntu hardy +# please adapt the following entries if you are using another distribution +# make sure that a recent version of live-initramfs is available +# (e.g. feisty doesn't ship live-initramfs at all, therefore the ppa is needed!) # A more comprehensive example is at /usr/share/doc/fai-doc/examples/etc -deb http://ftp.debian.org/debian etch main contrib non-free -#deb http://ftp.debian.org/debian etch-proposed-updates main contrib non-free -# repository that contains packages needed for etch -deb http://www.informatik.uni-koeln.de/fai/download etch koeln +deb http://archive.ubuntu.com/ubuntu hardy main restricted universe multiverse +deb http://security.ubuntu.com/ubuntu hardy-security main restricted universe multiverse + +deb http://ppa.launchpad.net/fai/ubuntu hardy main restricted universe multiverse -deb http://security.debian.org/debian-security etch/updates main contrib non-free --- fai-3.2.4+svn4837.orig/conf/NFSROOT +++ fai-3.2.4+svn4837/conf/NFSROOT @@ -8,6 +8,9 @@ sysutils dialog discover mdetect console-tools console-common expect iproute udev subversion +sysvinit upstart- +live-initramfs +linux-image-generic # needed for the simple examples cfengine2 libapt-pkg-perl @@ -17,11 +20,9 @@ PACKAGES aptitude I386 grub lilo read-edid -linux-image-486 unionfs-modules-2.6-486 PACKAGES install AMD64 grub lilo -linux-image-2.6-amd64 unionfs-modules-2.6-amd64 PACKAGES aptitude IA64 elilo gnu-efi efibootmgr --- fai-3.2.4+svn4837.orig/conf/make-fai-nfsroot.conf +++ fai-3.2.4+svn4837/conf/make-fai-nfsroot.conf @@ -12,7 +12,7 @@ # on the clients. This line(s) will be added to $nfsroot/etc/hosts. #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver" -FAI_DEBOOTSTRAP="etch http://ftp.debian.org/debian" +FAI_DEBOOTSTRAP="hardy 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 --- fai-3.2.4+svn4837.orig/examples/simple/package_config/FAIBASE +++ fai-3.2.4+svn4837/examples/simple/package_config/FAIBASE @@ -8,7 +8,6 @@ hdparm jove less -linuxlogo nfs-common nscd rdate --- fai-3.2.4+svn4837.orig/examples/simple/package_config/DEFAULT +++ fai-3.2.4+svn4837/examples/simple/package_config/DEFAULT @@ -1,13 +1,12 @@ PACKAGES aptitude I386 -linux-image-486 +linux-image-generic memtest86+ PACKAGES aptitude CHROOT -linux-image-486- -linux-image-amd64- +linux-image-generic- PACKAGES aptitude AMD64 -linux-image-amd64 +linux-image-generic memtest86+ PACKAGES aptitude DHCPC --- fai-3.2.4+svn4837.orig/debian/control +++ fai-3.2.4+svn4837/debian/control @@ -1,12 +1,15 @@ Source: fai Section: admin Priority: extra -Maintainer: Thomas Lange +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Thomas Lange Standards-Version: 3.7.2 Build-Depends-Indep: debiandoc-sgml, tetex-bin|texlive-base-bin, tetex-extra|texlive-latex-extra Build-Depends: debhelper (>= 4.1.16) -XS-Vcs-Svn: svn://svn.debian.org/svn/fai/trunk -XS-Vcs-Browser: http://svn.debian.org/wsvn/fai +XS-Vcs-Bzr: http://bazaar.launchpad.net/~fai/fai/trunk-ubuntu +XS-Vcs-Browser: https://code.launchpad.net/~fai/fai/trunk-ubuntu +XS-Original-Vcs-Svn: svn://svn.debian.org/svn/fai/trunk +XS-Original-Vcs-Browser: http://svn.debian.org/wsvn/fai Homepage: http://www.informatik.uni-koeln.de/fai Package: fai-client --- fai-3.2.4+svn4837.orig/debian/changelog +++ fai-3.2.4+svn4837/debian/changelog @@ -1,3 +1,37 @@ +fai (3.2.4+svn4837-0ubuntu1) hardy; urgency=low + + * upload as non-native package again. + * the branch fai 3.2.4 has been merged (LP: #187692) (actually this was + already done in the previous upload). + * use hardy instead of gutsy in the default configuration examples + (LP: #164916) + + -- Reinhard Tartler Thu, 14 Feb 2008 10:52:21 +0100 + +fai (3.2.4ubuntu1) hardy; urgency=low + + * merge changes from debian. Remaining changes: + * make-fai-nfsroot: mount devpts and reorder umounts so umount of + devpts is working. + * conf/NFSROOT: + + Add nfs-common Now default config space method works out of the box. + + install sysvinit instead of upstart in the nfsroot. + + adjust package names for ubuntu kernels + * conf/make-fai-nfsroot.conf, conf/sources.list: + + use gutsy, not feisty as default. Closes LP: #145748 + "make-fai-nfsroot.conf contains "feisty" as suite for debootstrap" + + add gutsy-security. There's no reason to install clients without + lastest security fixes. + * Fix some typos in the manual. + * simple example: + + package_config/DEFAULT replace debian 486 and amd64 linux kernels + with ubuntu's linux-image-generic + + package_config/FAIBASE: remove broken ubuntu package: linuxlogo + (blocked by #93943) + * lib/subroutines*: replace bashism $[...] with $(expr ...) + + -- Reinhard Tartler Wed, 13 Feb 2008 22:24:43 +0100 + fai (3.2.4) unstable; urgency=high * fai-cd.8: add missing -C option @@ -74,6 +108,45 @@ -- Thomas Lange Thu, 22 Nov 2007 15:45:12 +0100 +fai (3.2.1-0ubuntu2~ppa2~gutsy1) gutsy; urgency=low + + * debian/control: add XS-Vcs-Bzr and -Browser info. Rename debian entries + to XS-Original-Vcs-*. + + * Fix protection of /var/log/fai/{current,/_}: + 750 (root:adm) + + -- Achim Bohnet Thu, 04 Oct 2007 17:42:18 +0200 + +fai (3.2.1-0ubuntu2~ppa1~gutsy1) gutsy; urgency=low + + [ Achim Bohnet ] + * Fix some typos in the manual. + * make-fai-nfsroot: mount devpts and reorder umounts so umount of + devpts is working. + * Add nfs-common to /etc/fai/NFSROOT. Now default config space method + works out of the box. + * bin/fai: + + export romountopt variable. Fixes broken NFS mount of the + config space in get-config-dir-nfs + + add -n to romountopt. In live sys /etc/mtab is a soft link + to /proc/mounts that is readonly. + + bin/fai: move initialization of $start_seconds to fai_init(): There + we can be sure that /proc is mounted. + * conf/make-fai-nfsroot.conf, conf/sources.list: + + use gutsy, not feisty as default. Closes LP: #145748 + "make-fai-nfsroot.conf contains "feisty" as suite for debootstrap" + + add gutsy-security. There's no reason to install clients without + lastest security fixes. + * lib/subroutines*: replace bashism $[...] with $(expr ...) + * simple example: + + package_config/DEFAULT replace debian 486 and amd64 linux kernels + with ubuntu's linux-image-generic + + package_config/FAIBASE: remove broken ubuntu package: linuxlogo + (blocked by #93943) + + -- Achim Bohnet Wed, 26 Sep 2007 01:05:19 +0200 + fai (3.2.1) unstable; urgency=low * mount swap partitions with identical priorities @@ -117,6 +190,28 @@ -- Thomas Lange Mon, 17 Sep 2007 13:30:34 +0200 +fai (3.2.1-0ubuntu1) gutsy; urgency=low + + * Sync New Upstream Version to ubuntu. + - Exception Request granted in LP: #139637 + - Problems with update-initramfs fixed: LP: #137511 + - fai-setup works now LP: #89026 + - static ip problem fixed ages ago: LP: #69862 + - fix dependency breakage: LP: #93876 + * Upload to ubuntu with some small changes: + * Turn the package from native to non-native, the orig tarball is identical + to the tarball in debian. + * bin/fai: check if /proc is mounted in the nfsroot. if it isn't mount it + * conf/NFSROOT: deinstall upstart, use sysvinit instead + * conf/NFSROOT: install linux-image-generic as kernel image. This is + thankfully consistent on all ubuntu architectures. We can drop + unionsfs modules as well, since we have them in the kernel package. + * conf/make-fai-nfsroot.conf: use archive.ubuntu.com for bootstrap + * conf/sources.list: use archive.ubuntu.com as sources. + * conf/sources.list: use fai-team's PPA for live-initramfs packages + + -- Reinhard Tartler Sat, 08 Sep 2007 17:36:43 +0200 + fai (3.2) unstable; urgency=low * subroutines-linux: fix extra slash in path (closes: #428860), @@ -346,6 +441,17 @@ more in etch -- Thomas Lange Mon, 6 Nov 2006 15:57:01 +0100 + +fai (3.1ubuntu1) edgy; urgency=low + + * merge FAI 3.1 changes. All necessary ubuntu hacks have been + incorporated by upstream (thanks Thomas). + * changes to default configuration to make a usable ubuntu installation + - point to archive.ubuntu.com instead of ftp.debian.org + - use sysvinit instead of upstart, because its default bootlog behavior + * make fai-mount-disk use /bin/bash instead of /bin/sh + + -- Reinhard Tartler Sat, 21 Oct 2006 10:30:18 +0200 fai (3.1) unstable; urgency=medium --- fai-3.2.4+svn4837.orig/doc/fai-guide.sgml +++ fai-3.2.4+svn4837/doc/fai-guide.sgml @@ -1171,7 +1171,7 @@ After the root file system is mounted read only, it is made writable by mounting a RAM disk via unionfs on top of it. So it's possible for -programms or daemons to write to files inside a read only mounted file system. +programs or daemons to write to files inside a read only mounted file system. We are using the package live-initramfs to mount the nfsroot and to make this file system writable using unionfs. --- fai-3.2.4+svn4837.orig/lib/subroutines-linux +++ fai-3.2.4+svn4837/lib/subroutines-linux @@ -267,7 +267,7 @@ fai-divert -R rm -f $FAI_ROOT/etc/apt/apt.conf.d/{10,90}fai date - echo "The $FAI_ACTION took $[$(cut -d . -f 1 /proc/uptime)-$start_seconds] seconds." + echo "The $FAI_ACTION took $(expr $(cut -d . -f 1 /proc/uptime) - $start_seconds) seconds." } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - task_chboot() { --- fai-3.2.4+svn4837.orig/lib/subroutines +++ fai-3.2.4+svn4837/lib/subroutines @@ -547,7 +547,8 @@ task instsoft task configure date - echo "The $FAI_ACTION took $[$(cut -d . -f 1 /proc/uptime)-$start_seconds] seconds." + echo "The $FAI_ACTION took $(expr $(cut -d . -f 1 /proc/uptime) - $start_seconds) seconds." + rm -f $stamp # save again, because new messages could be created --- fai-3.2.4+svn4837.orig/bin/make-fai-nfsroot +++ fai-3.2.4+svn4837/bin/make-fai-nfsroot @@ -348,11 +348,13 @@ cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf-installserver cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf # this is needed during make-fai-nfsroot fi + mount -t proc /proc $NFSROOT/proc + mount -t devpts -o rw,gid=5,mode=620 /devpts $NFSROOT/dev/pts + $ROOTCMD apt-get update $ROOTCMD aptitude -Rfy install fai-nfsroot $ROOTCMD apt-get check rm -rf $NFSROOT/etc/apm - mount -t proc /proc $NFSROOT/proc if [ $divert = 1 ]; then fdivert /usr/sbin/update-initramfs @@ -386,6 +388,7 @@ [ -f $NFSROOT/usr/sbin/dpkg-divert ] && LC_ALL=C $ROOTCMD dpkg-divert --rename --remove /sbin/discover-modprobe cd / + [ -d $NFSROOT/proc/self ] && umount $NFSROOT/dev/pts [ -d $NFSROOT/proc/self ] && umount $NFSROOT/proc [ -d $NFSROOT/proc/self ] && die "/proc still mounted inside the nfsroot." if [ "$FAI_DEBMIRROR" ]; then