This version (debian source package patch attached) reverts to the old /tmp/resolv.conf method for sunos and uses resolvconf for linux.
I am a little confused... /usr/share/fai/subroutines exists for each operating system; make-fai-nfsroot seems to be debian-specific. Is this correct? Cheers, -- martin; (greetings from the heart of the sun.) \____ echo mailto: !#^."<*>"|tr "<*> mailto:"; [EMAIL PROTECTED] invalid/expired pgp subkeys? use subkeys.pgp.net as keyserver! spamtraps: [EMAIL PROTECTED] one has to multiply thoughts to the point where there aren't enough policemen to control them. -- stanislaw jerzey lec
diff -Nru /tmp/XnbcXjqZ5i/fai-2.6.6/THANKS /tmp/xVKsQkueKY/fai-2.6.6.2/THANKS
--- /tmp/XnbcXjqZ5i/fai-2.6.6/THANKS 2004-07-23 12:09:14.000000000 +0200
+++ /tmp/xVKsQkueKY/fai-2.6.6.2/THANKS 2005-02-23 11:42:59.000000000 +0100
@@ -39,3 +39,4 @@
Chad Walstrom [EMAIL PROTECTED]
Niall Young [EMAIL PROTECTED]
Alexander Zangerl [EMAIL PROTECTED]
+martin f. krafft [EMAIL PROTECTED]
diff -Nru /tmp/XnbcXjqZ5i/fai-2.6.6/conf/make-fai-nfsroot.conf
/tmp/xVKsQkueKY/fai-2.6.6.2/conf/make-fai-nfsroot.conf
--- /tmp/XnbcXjqZ5i/fai-2.6.6/conf/make-fai-nfsroot.conf 2005-01-07
05:40:42.000000000 +0100
+++ /tmp/xVKsQkueKY/fai-2.6.6.2/conf/make-fai-nfsroot.conf 2005-02-23
11:34:59.000000000 +0100
@@ -43,6 +43,6 @@
# FAI needs these packages that are install into the nfsroot
packages="module-init-tools dhcp3-client ssh file rdate hwinfo portmap
bootpc rsync wget rsh-client less dump reiserfsprogs usbutils
-ext2resize hdparm smartmontools parted raidtools2 lvm2
+ext2resize hdparm smartmontools parted raidtools2 lvm2 resolvconf
dnsutils ntpdate dosfstools cfengine cvs jove xfsprogs xfsdump
sysutils dialog discover mdetect libnet-perl netcat libapt-pkg-perl"
diff -Nru /tmp/XnbcXjqZ5i/fai-2.6.6/debian/changelog
/tmp/xVKsQkueKY/fai-2.6.6.2/debian/changelog
--- /tmp/XnbcXjqZ5i/fai-2.6.6/debian/changelog 2005-01-21 04:24:27.000000000
+0100
+++ /tmp/xVKsQkueKY/fai-2.6.6.2/debian/changelog 2005-02-23
13:46:57.000000000 +0100
@@ -1,3 +1,16 @@
+fai (2.6.6.2) unstable; urgency=low
+
+ * Reverted to /tmp/resolv.conf for sunos for now.
+
+ -- martin f. krafft <[EMAIL PROTECTED]> Wed, 23 Feb 2005 13:45:37 +0100
+
+fai (2.6.6.1) unstable; urgency=low
+
+ * Ported FAI to use resolvconf on install client for management of
+ /etc/resolv.conf.
+
+ -- martin f. krafft <[EMAIL PROTECTED]> Wed, 23 Feb 2005 11:42:08 +0100
+
fai (2.6.6) unstable; urgency=medium
* 06hwdetect.source: add comment, add class NVIDIA which is not currently
diff -Nru /tmp/XnbcXjqZ5i/fai-2.6.6/scripts/make-fai-nfsroot
/tmp/xVKsQkueKY/fai-2.6.6.2/scripts/make-fai-nfsroot
--- /tmp/XnbcXjqZ5i/fai-2.6.6/scripts/make-fai-nfsroot 2005-01-13
13:44:04.000000000 +0100
+++ /tmp/xVKsQkueKY/fai-2.6.6.2/scripts/make-fai-nfsroot 2005-02-23
11:34:38.000000000 +0100
@@ -235,9 +235,8 @@
if [ "$FAI_DEBOOTSTRAP" ]; then
call_with_stamp call_debootstrap $FAI_DEBOOTSTRAP
$ROOTCMD apt-get clean
- rm -f $NFSROOT/etc/resolv.conf
echo "Creating base.tgz"
- tar -l -C $NFSROOT -cf - --exclude var/tmp/base.tgz . | gzip >
$NFSROOT/var/tmp/base.tgz
+ tar -l -C $NFSROOT -cf - --exclude var/tmp/base.tgz --exclude
dev/shm/\* . | gzip > $NFSROOT/var/tmp/base.tgz
else
die "\$FAI_DEBOOTSTRAP not defined."
fi
@@ -299,7 +298,6 @@
ln -sf /tmp/var/state/discover var/state/discover
ln -sf /tmp/var/lib/discover var/lib/discover
ln -s /tmp/etc/syslogsocket dev/log
- ln -sf /tmp/etc/resolv.conf etc/resolv.conf
ln -sf /tmp etc/sysconfig
ln -s ../../sbin/rcS_fai etc/init.d/rcS
ln -sf /dev/null etc/network/ifstate
diff -Nru /tmp/XnbcXjqZ5i/fai-2.6.6/share/subroutines
/tmp/xVKsQkueKY/fai-2.6.6.2/share/subroutines
--- /tmp/XnbcXjqZ5i/fai-2.6.6/share/subroutines 2005-01-21 04:28:53.000000000
+0100
+++ /tmp/xVKsQkueKY/fai-2.6.6.2/share/subroutines 2005-02-23
13:50:06.000000000 +0100
@@ -321,6 +321,11 @@
mount2dir $FAI_ROOT $LOGDIR/$fstab
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+task_resolvconf() {
+
+ prepare_resolv_conf
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
task_configure() {
fai-do-scripts $FAI/scripts
@@ -369,6 +374,7 @@
task partition
task mountdisks
+ task resolvconf
task extrbase
task mirror
task updatebase
diff -Nru /tmp/XnbcXjqZ5i/fai-2.6.6/share/subroutines-linux
/tmp/xVKsQkueKY/fai-2.6.6.2/share/subroutines-linux
--- /tmp/XnbcXjqZ5i/fai-2.6.6/share/subroutines-linux 2005-01-15
21:28:00.000000000 +0100
+++ /tmp/xVKsQkueKY/fai-2.6.6.2/share/subroutines-linux 2005-02-23
13:50:11.000000000 +0100
@@ -203,3 +203,10 @@
return $?
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+prepare_resolv_conf() {
+
+ mkdir -p $FAI_ROOT/dev/shm
+ mount -t tmpfs none $FAI_ROOT/dev/shm
+ # we need not do more -- the resolvconf packages handles the rest
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff -Nru /tmp/XnbcXjqZ5i/fai-2.6.6/share/subroutines-sunos
/tmp/xVKsQkueKY/fai-2.6.6.2/share/subroutines-sunos
--- /tmp/XnbcXjqZ5i/fai-2.6.6/share/subroutines-sunos 2004-08-04
00:26:39.000000000 +0200
+++ /tmp/xVKsQkueKY/fai-2.6.6.2/share/subroutines-sunos 2005-02-23
13:52:51.000000000 +0100
@@ -133,3 +133,10 @@
task_faiend
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - -
+prepare_resolv_conf() {
+
+ # use old method on sunos (no resolvconf package)
+ install -m644 /etc/resolv.conf-installserver $FAI_ROOT/tmp/resolv.conf
+ ln -s /tmp/resolv.conf $FAI_ROOT/etc
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - -
signature.asc
Description: Digital signature
