diff -Nru /tmp/Um8mejrAch/fai-3.1.8/conf/make-fai-nfsroot.conf /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/conf/make-fai-nfsroot.conf --- /tmp/Um8mejrAch/fai-3.1.8/conf/make-fai-nfsroot.conf 2006-09-14 12:27:19.000000000 +0200 +++ /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/conf/make-fai-nfsroot.conf 2007-03-19 21:51:38.000000000 +0100 @@ -9,7 +9,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="feisty 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 diff -Nru /tmp/Um8mejrAch/fai-3.1.8/conf/NFSROOT /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/conf/NFSROOT --- /tmp/Um8mejrAch/fai-3.1.8/conf/NFSROOT 2007-03-06 23:18:31.000000000 +0100 +++ /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/conf/NFSROOT 2007-03-19 21:51:38.000000000 +0100 @@ -8,6 +8,7 @@ sysutils dialog discover mdetect console-tools console-common expect iproute udev subversion +sysvinit upstart- # you should not edit the lines below # architecture dependend list of packages that are installed diff -Nru /tmp/Um8mejrAch/fai-3.1.8/conf/sources.list /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/conf/sources.list --- /tmp/Um8mejrAch/fai-3.1.8/conf/sources.list 2006-09-14 12:29:04.000000000 +0200 +++ /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/conf/sources.list 2007-03-19 21:54:34.000000000 +0100 @@ -1,7 +1,5 @@ # These lines should work for many sites -# A more comprehensive example can be found in /usr/share/doc/fai/examples/etc +# A more comprehensive example can be found in /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 +deb http://archive.ubuntu.com/ubuntu feisty main restricted universe multiverse -deb http://security.debian.org/debian-security etch/updates main contrib non-free diff -Nru /tmp/Um8mejrAch/fai-3.1.8/debian/changelog /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/debian/changelog --- /tmp/Um8mejrAch/fai-3.1.8/debian/changelog 2007-03-13 23:39:57.000000000 +0100 +++ /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/debian/changelog 2007-03-19 22:24:39.000000000 +0100 @@ -1,3 +1,34 @@ +fai (3.1.8ubuntu1) feisty; urgency=low + + * Merge ubuntu changes: + + Drop ubuntu changes, fixed upstream: + + Makefile: make sure /bin/bash is SHELL + + example/simple: several scripts use bashisms. Use /bin/bash + instead of /bin/sh + + examples/simple/package_config/DEMO remove bogus commnt sign + + Drop ubuntu change: + + examples/simple/files/boot/grub/menu.lst/postinst: + use /sbin/update-grub instead of /usr/sbin/update-grub + + Kept ubuntu changes: + + debian/changelog: merge old ubuntu changelog items + + conf/make-fai-nfsroot.conf: use feisty and ubuntu archive for + debootstrap + + conf/NFSROOT: install sysvinit and remove upstart + + conf/sources.list: use ubuntu feisty package repository + + examples/simple/package_config/FAIBASE: use ubuntu's -generic linux + kernel + + VERSION: use ubuntu fai-kernel version + + * conf/sources.list: fix path to example sources.list. It's in + package fai-doc not fai. + + * debian/control: Update Maintainer + + -- Achim Bohnet Mon, 19 Mar 2007 21:23:04 +0100 + fai (3.1.8) unstable; urgency=medium * conf/NFSROOT: remove unknow package name (closes: 407950) @@ -51,6 +82,36 @@ -- Thomas Lange Thu, 4 Jan 2007 15:30:42 +0100 +fai (3.1.3ubuntu1) feisty; urgency=low + + [Reinhard Tartler] + * Review and clean up Achim's diff + + [Achim Bohnet] + * Merge from debian unstable. + + all kubuntu changes kept. + + all but one conflict due to svn $ID$ tags + + ./VERSION stick with kubuntu kernel + * conf/make-nfsroot.conf conf/sources.list: replace edgy with feisty + + * simple example config fixes: + + + replace #!/bin/sh with #!/bin/bash in all script. ifclass is a + function that gets not defined if sh is dash. Also (error|1) got + trap statements were broken: + class/10-base-classes hooks/instsoft.FAIBASE scripts/DEMO/10-misc + scripts/FAIBASE/30-interface scripts/FAIBASE/10-misc + scripts/LAST/50-misc + + + files/boot/grub/menu.lst/postinst: fix update-grub full path. It's + in /sbin not /usr/sbin + + * doc/Makefile clean target: add doc/fai-guide.tex-in doc/fai-guide.aux + doc/fai-guide.toc. They are left behind when building docs fails + or is interrupted. + + -- Achim Bohnet Wed, 20 Dec 2006 23:07:13 +0100 + fai (3.1.3) unstable; urgency=medium * fai-savelog: fix a security tagged bug, make local copy of LOGDIR only @@ -113,6 +174,17 @@ -- 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 * Makefile: force bash in Makefile, fixes FTBFS in ubuntu diff -Nru /tmp/Um8mejrAch/fai-3.1.8/debian/control /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/debian/control --- /tmp/Um8mejrAch/fai-3.1.8/debian/control 2006-11-23 21:37:07.000000000 +0100 +++ /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/debian/control 2007-03-19 22:25:47.000000000 +0100 @@ -1,7 +1,8 @@ Source: fai Section: admin Priority: extra -Maintainer: Thomas Lange +Maintainer: Achim Bohnet +XSBC-Original-Maintainer: Thomas Lange Standards-Version: 3.7.2 Build-Depends-Indep: debiandoc-sgml, tetex-bin, tetex-extra Build-Depends: debhelper (>= 4.1.16) diff -Nru /tmp/Um8mejrAch/fai-3.1.8/doc/Makefile /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/doc/Makefile --- /tmp/Um8mejrAch/fai-3.1.8/doc/Makefile 2006-09-27 15:49:12.000000000 +0200 +++ /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/doc/Makefile 2007-03-19 21:51:38.000000000 +0100 @@ -29,7 +29,7 @@ nsgmls -wall -E20 -gues $(fdocname) clean: - rm -rf $(docname).txt $(docname).dvi $(docname).pdf $(docname).html $(docname).sasp* *~ $(docname).texinfo $(docname).ps $(docname).out $(docname).tpt $(docname).tex + rm -rf $(docname).txt $(docname).dvi $(docname).pdf $(docname).html $(docname).sasp* *~ $(docname).texinfo $(docname).ps $(docname).out $(docname).tpt $(docname).tex $(docname).tex-in $(docname).aux $(docname).toc rm -f body.tmp head.tmp thb*.png *.log print: dvi diff -Nru /tmp/Um8mejrAch/fai-3.1.8/examples/simple/package_config/FAIBASE /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/examples/simple/package_config/FAIBASE --- /tmp/Um8mejrAch/fai-3.1.8/examples/simple/package_config/FAIBASE 2006-12-12 18:17:48.000000000 +0100 +++ /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/examples/simple/package_config/FAIBASE 2007-03-19 21:51:38.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGES aptitude -linux-image-486 +linux-image-generic cfengine2 cron debconf-utils diff -Nru /tmp/Um8mejrAch/fai-3.1.8/VERSION /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/VERSION --- /tmp/Um8mejrAch/fai-3.1.8/VERSION 2006-11-23 21:41:25.000000000 +0100 +++ /tmp/55ZgJuTN7Z/fai-3.1.8ubuntu1/VERSION 2007-03-19 21:51:38.000000000 +0100 @@ -1,4 +1,4 @@ VERSIONSTRING="$(shell perl -e 'while (<>) { /^(\S+).*\((.*)\)/ and print uc($$1) . " $$2, "; if (/ --.*,\s+(.*)\s\d+:/) { print "$$1" ; exit } }' $(SRCDIR)debian/changelog)" # in several files the string _KERNELVERSION_ will be replaced by the # value of KERNELVERSION -KERNELVERSION=2.6.18 +KERNELVERSION=2.6.17.13-ubuntu1