Hi,
I've tried an fai 3.1.3 installation on Edgy. The appended patch
makes a FAIBASE installation succeed:
* The changing /bin/sh with /bin/bash should not hurt if done
in debian too.
* Strange thing is the full path of update-grub.
In Kubuntu Edgy there is only /sbin/update-grup. While in debian
sid both exists:
sbin/update-grub admin/grub
usr/sbin/update-grub
admin/grub,admin/grub2
If there no plan to support grub2, it would be nice to switch
to /sbin/update-grub too. Otherwise it will stay an kubuntu
specific change.
* extending doc/Makefile's clean rule is distro agnostic
Thx,
Achim
--
To me vi is Zen. To use vi is to practice zen. Every command is
a koan. Profound to the user, unintelligible to the uninitiated.
You discover truth everytime you use it.
-- [EMAIL PROTECTED]
diff -u fai-3.1.3ubuntu0/debian/changelog fai-3.1.3ubuntu0/debian/changelog
--- fai-3.1.3ubuntu0/debian/changelog
+++ fai-3.1.3ubuntu0/debian/changelog
@@ -1,3 +1,23 @@
+fai (3.1.3ubuntu0-ach0edgy2) edgy; urgency=low
+
+ * 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 <[EMAIL PROTECTED]> Wed, 20 Dec 2006 23:07:13 +0100
+
fai (3.1.3ubuntu0-ach0edgy1) edgy; urgency=low
* Merge from debian unstable.
only in patch2:
unchanged:
--- fai-3.1.3ubuntu0.orig/doc/Makefile
+++ fai-3.1.3ubuntu0/doc/Makefile
@@ -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
only in patch2:
unchanged:
--- fai-3.1.3ubuntu0.orig/examples/simple/class/10-base-classes
+++ fai-3.1.3ubuntu0/examples/simple/class/10-base-classes
@@ -1,8 +1,8 @@
-#! /bin/sh
+#! /bin/bash
# echo architecture and OS name in upper case. Do NOT remove these two lines
uname -s | tr '[:lower:]' '[:upper:]'
[ -x "`which dpkg`" ] && dpkg --print-installation-architecture | tr a-z A-Z
[ -f /boot/RUNNING_FROM_FAICD ] && echo "FAICD"
-exit 0
\ No newline at end of file
+exit 0
only in patch2:
unchanged:
--- fai-3.1.3ubuntu0.orig/examples/simple/class/50-host-classes
+++ fai-3.1.3ubuntu0/examples/simple/class/50-host-classes
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
# assign classes hosts
only in patch2:
unchanged:
--- fai-3.1.3ubuntu0.orig/examples/simple/files/boot/grub/menu.lst/postinst
+++ fai-3.1.3ubuntu0/examples/simple/files/boot/grub/menu.lst/postinst
@@ -13,7 +13,7 @@
grub-install --no-floppy --root-directory=$target $BOOT_DEVICE
GROOT=$(device2grub $BOOT_PARTITION)
perl -pi -e 's/#(\w+)#/$ENV{$1}/' $2
-$ROOTCMD /usr/sbin/update-grub
+$ROOTCMD /sbin/update-grub
echo "Grub installed on $BOOT_DEVICE on $GROOT"
exit $error
only in patch2:
unchanged:
--- fai-3.1.3ubuntu0.orig/examples/simple/hooks/instsoft.FAIBASE
+++ fai-3.1.3ubuntu0/examples/simple/hooks/instsoft.FAIBASE
@@ -1,3 +1,3 @@
-#! /bin/sh
+#! /bin/bash
[ -s $target/etc/kernel-img.conf ] || fcopy -Bi /etc/kernel-img.conf
only in patch2:
unchanged:
--- fai-3.1.3ubuntu0.orig/examples/simple/scripts/DEMO/10-misc
+++ fai-3.1.3ubuntu0/examples/simple/scripts/DEMO/10-misc
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
# (c) Thomas Lange, 2001-2006, [EMAIL PROTECTED]
only in patch2:
unchanged:
--- fai-3.1.3ubuntu0.orig/examples/simple/scripts/FAIBASE/30-interface
+++ fai-3.1.3ubuntu0/examples/simple/scripts/FAIBASE/30-interface
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
error=0 ; trap "error=$((error|1))" ERR
only in patch2:
unchanged:
--- fai-3.1.3ubuntu0.orig/examples/simple/scripts/FAIBASE/10-misc
+++ fai-3.1.3ubuntu0/examples/simple/scripts/FAIBASE/10-misc
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
# (c) Thomas Lange, 2001-2006, [EMAIL PROTECTED]
only in patch2:
unchanged:
--- fai-3.1.3ubuntu0.orig/examples/simple/scripts/LAST/50-misc
+++ fai-3.1.3ubuntu0/examples/simple/scripts/LAST/50-misc
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
# copyright Thomas Lange 2001-2006, [EMAIL PROTECTED]
