rpms/system-config-netboot/F-8 system-config-netboot-0.1.42-nfs4.patch, NONE, 1.1 system-config-netboot-0.1.42-rval.patch, NONE, 1.1 system-config-netboot-0.1.42-secon.patch, NONE, 1.1 system-config-netboot-0.1.42-tmpdev.patch, NONE, 1.1 system-config-netboot.spec, 1.48, 1.49

Radek Brich (rbrich) fedora-extras-commits at redhat.com
Tue Mar 25 14:09:57 UTC 2008


Author: rbrich

Update of /cvs/extras/rpms/system-config-netboot/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2928

Modified Files:
	system-config-netboot.spec 
Added Files:
	system-config-netboot-0.1.42-nfs4.patch 
	system-config-netboot-0.1.42-rval.patch 
	system-config-netboot-0.1.42-secon.patch 
	system-config-netboot-0.1.42-tmpdev.patch 
Log Message:
backport fixes from rawhide: #406711 and others

system-config-netboot-0.1.42-nfs4.patch:

--- NEW FILE system-config-netboot-0.1.42-nfs4.patch ---
diff -up system-config-netboot-0.1.42/diskless/diskless.init.nfs4 system-config-netboot-0.1.42/diskless/diskless.init
--- system-config-netboot-0.1.42/diskless/diskless.init.nfs4	2006-03-05 20:01:54.000000000 +0100
+++ system-config-netboot-0.1.42/diskless/diskless.init	2008-03-21 14:06:16.000000000 +0100
@@ -22,6 +22,9 @@ RETVAL=0
 prog="diskless"
 
 start() {
+        # mount rpc_pipefs for NFS4 idmapd
+        mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs &>/dev/null
+
         if [ ! -e /var/lock/subsys/diskless ]; then
 	    umount /.oldroot 2> /dev/NULL
 	    /sbin/blockdev --flushbufs /dev/ram0

system-config-netboot-0.1.42-rval.patch:

--- NEW FILE system-config-netboot-0.1.42-rval.patch ---
--- system-config-netboot-0.1.42/diskless/mkdiskless.rval	2006-04-19 21:10:24.000000000 +0200
+++ system-config-netboot-0.1.42/diskless/mkdiskless	2008-01-07 15:48:37.000000000 +0100
@@ -72,8 +72,8 @@
 if [ ! -e $ROOT/etc/init.d/diskless ] || [ -n "$FORCE_MKDISKLESS" ]; then
     cp -fp $INSTALLDIR/diskless.init $ROOT/etc/init.d/diskless;
     chmod 755 $ROOT/etc/init.d/diskless;
-    ds=`ls $ROOT/etc/rc.d/rc*.d/[KS]*diskless`;
-    if [ -z "$ds" ] || [ -n "$FORCE_MKDISKLESS" ]; then
+    ls $ROOT/etc/rc.d/rc*.d/[KS]*diskless &>/dev/null;
+    if [ $? -ne 0 ] || [ -n "$FORCE_MKDISKLESS" ]; then
 	(cd $ROOT/etc/rc3.d/; ln -sf ../init.d/diskless S01diskless);
 	(cd $ROOT/etc/rc5.d/; ln -sf ../init.d/diskless S01diskless);
     fi;
@@ -104,7 +104,7 @@
 #
 #  With old initscripts (RHL-8), prevent fsck failure for '/' rootfs device :-( 
 #  / disable fsck checking at boot (since the clients are meant to be diskless!):
-    if ! egrep -p '^fastboot=' $ROOT/etc/sysconfig/init; then
+    if ! egrep -q '^fastboot=' $ROOT/etc/sysconfig/init; then
 	echo 'fastboot=yes' >> $ROOT/etc/sysconfig/init ;
     fi;
 fi
@@ -311,3 +311,5 @@
 #    echo "$SNAPSHOT *(rw,no_root_squash,sync)" >> /etc/exports ;
 #    exportfs -r ;
 #fi
+
+exit 0

system-config-netboot-0.1.42-secon.patch:

--- NEW FILE system-config-netboot-0.1.42-secon.patch ---
diff -up system-config-netboot-0.1.42/diskless/updateDiskless.secon system-config-netboot-0.1.42/diskless/updateDiskless
--- system-config-netboot-0.1.42/diskless/updateDiskless.secon	2007-10-12 14:36:28.000000000 +0200
+++ system-config-netboot-0.1.42/diskless/updateDiskless	2008-03-21 14:17:05.000000000 +0100
@@ -289,8 +289,8 @@ if ! /usr/bin/gzip -c -9 $uncompressedim
 fi
 /bin/rm -f $uncompressedimage
 SIDEFFECTS=$IMAGEFILE
-if ! /bin/cp -a "$KERNEL" "$DESTDIR"/vmlinuz; then
-   echo "/bin/cp -a $KERNEL $DESTDIR/vmlinuz failed.";
+if ! /bin/cp "$KERNEL" "$DESTDIR"/vmlinuz; then
+   echo "/bin/cp $KERNEL $DESTDIR/vmlinuz failed.";
    die;
 fi
 exit 0;

system-config-netboot-0.1.42-tmpdev.patch:

--- NEW FILE system-config-netboot-0.1.42-tmpdev.patch ---
diff -up system-config-netboot-0.1.42/diskless/mkdiskless.tmpdev system-config-netboot-0.1.42/diskless/mkdiskless
--- system-config-netboot-0.1.42/diskless/mkdiskless.tmpdev	2007-10-12 11:10:02.000000000 +0200
+++ system-config-netboot-0.1.42/diskless/mkdiskless	2008-03-21 14:17:15.000000000 +0100
@@ -260,6 +260,11 @@ if [ ! -e $ROOT/etc/ssh.prediskless ] ||
    touch $ROOT/etc/ssh.prediskless;
    rm -f $ROOT/etc/ssh/ssh_host_*;
 fi
+
+#
+#  Make sure the /dev exists
+mkdir $ROOT/dev &>/dev/null;
+
 #
 #  We need to make small changes to the following startup scripts,
 #  with initscripts < 7.62 (ie. RHEL-3 or before) :
diff -up system-config-netboot-0.1.42/diskless/files.tmpdev system-config-netboot-0.1.42/diskless/files
--- system-config-netboot-0.1.42/diskless/files.tmpdev	2006-04-19 23:04:07.000000000 +0200
+++ system-config-netboot-0.1.42/diskless/files	2008-03-21 14:17:15.000000000 +0100
@@ -5,7 +5,6 @@
 # add files please create a files.custom in this directory and add entries to it.
 #
 /boot/kernel.h
-/dev/
 /etc/resolv.conf
 /etc/resolv.conf.predhclient
 /etc/yp.conf
diff -up system-config-netboot-0.1.42/diskless/disklessrc.tmpdev system-config-netboot-0.1.42/diskless/disklessrc
--- system-config-netboot-0.1.42/diskless/disklessrc.tmpdev	2007-10-16 18:34:33.000000000 +0200
+++ system-config-netboot-0.1.42/diskless/disklessrc	2008-03-25 14:24:55.000000000 +0100
@@ -105,14 +105,6 @@ mountfile () {
 	    echo "Creating ${1}"
 	    touch $snapshotfile
 	fi
-    else
-#  If dev directory already exists in snapshot directory, check if the root 
-#   /dev directory is newer.  If it is rsync the root directory over the 
-#   snapshot directory.
-	if [ ${1} == "/dev" -a ${1} -nt ${dir}/dev ]; then
-	    echo "RSYNC-ing /dev";
-	    rsync -a /mnt/${1} $snapshotfile
-	fi
     fi
 #
 #  Mount the snapshotfile over the root file so the client will have r/w access
@@ -124,7 +116,43 @@ echo "==================================
 echo "Running /disklessrc"
 
 echo "Mounting /proc"
-/bin/mount -n -t proc /proc /proc
+mount -n -t proc /proc /proc
+ 
+#
+# Make /dev on tmpfs
+#
+echo Creating /dev
+mount -o mode=0755 -t tmpfs /dev /dev
+mkdir /dev/pts
+mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts
+mkdir /dev/shm
+mkdir /dev/mapper
+echo Creating initial device nodes
+mknod /dev/null c 1 3
+mknod /dev/zero c 1 5
+mknod /dev/systty c 4 0
+mknod /dev/tty c 5 0
+mknod /dev/console c 5 1
+mknod /dev/ptmx c 5 2
+mknod /dev/rtc c 10 135
+mknod /dev/tty0 c 4 0
+mknod /dev/tty1 c 4 1
+mknod /dev/tty2 c 4 2
+mknod /dev/tty3 c 4 3
+mknod /dev/tty4 c 4 4
+mknod /dev/tty5 c 4 5
+mknod /dev/tty6 c 4 6
+mknod /dev/tty7 c 4 7
+mknod /dev/tty8 c 4 8
+mknod /dev/tty9 c 4 9
+mknod /dev/tty10 c 4 10
+mknod /dev/tty11 c 4 11
+mknod /dev/tty12 c 4 12
+mknod /dev/ttyS0 c 4 64
+mknod /dev/ttyS1 c 4 65
+mknod /dev/ttyS2 c 4 66
+mknod /dev/ttyS3 c 4 67
+
 
 if [ "${INITRD_DBG}" = "1" ]; then exec /bin/bash; fi
 
@@ -354,10 +382,6 @@ mount -n -t nfs $NFS_IP:${NFS_DIR}/snaps
 	    mountfile $i ${SNAPSHOT}
 	fi;
     done
-
-    mount --bind /proc /mnt/proc
-    chroot /mnt /sbin/ifup lo
-    umount /mnt/proc
 }
 
 if [ "${INITRD_DBG}" = "6" ]; then exec /bin/bash; fi
@@ -376,8 +400,6 @@ cp -fp /tmp/dhclient.leases /mnt/var/lib
 
 if [ "${INITRD_DBG}" = "7" ]; then exec /bin/bash; fi
 
-#echo "Mounting the devfs filesystem"
-#mount -n -t devfs /devfs /dev
 #
 # Complete the network boot by killing the dhcp client.
 # Umount file systems that are no longer used.
@@ -399,4 +421,7 @@ export keep_old_ip=yes
 export fastboot=yes
 export READONLY=yes
 
+# make /dev accessible from new root
+mount --bind /dev /mnt/dev
+
 exec /sbin/switch_root -c /dev/console /mnt /sbin/init


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-netboot/F-8/system-config-netboot.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- system-config-netboot.spec	17 Oct 2007 09:25:32 -0000	1.48
+++ system-config-netboot.spec	25 Mar 2008 14:09:27 -0000	1.49
@@ -2,10 +2,14 @@
 Summary:   system-config-netboot is an network booting/install configuration utility
 Name: 	   system-config-netboot
 Version:   0.1.42
-Release:   1%{dist}
+Release:   2%{dist}
 URL: 	   http://www.redhat.com/ 
 Source0:   %{name}-%{version}.tar.gz
 Source1:   pxelinux.0
+Patch1:    system-config-netboot-0.1.42-tmpdev.patch
+Patch2:    system-config-netboot-0.1.42-nfs4.patch
+Patch3:    system-config-netboot-0.1.42-secon.patch
+Patch4:    system-config-netboot-0.1.42-rval.patch
 License:   GPLv2+
 Group:     Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -23,6 +27,10 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .tmpdev
+%patch2 -p1 -b .nfs4
+%patch3 -p1 -b .secon
+%patch4 -p1 -b .rval
 %configure
 
 %build
@@ -61,6 +69,7 @@
 %{_datadir}/pixmaps/system-config-netboot.xpm
 %{_datadir}/icons/hicolor/48x48/apps/system-config-netboot.png
 %{_mandir}/*/*.8*
+/tftpboot/linux-install/
 /tftpboot/linux-install/pxelinux.cfg/
 /tftpboot/linux-install/msgs/
 /tftpboot/linux-install/pxelinux.0
@@ -68,6 +77,14 @@
 %config %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Fri Mar 21 2008 Radek Brich <rbrich at redhat.com> - 0.1.42-2
+- do not mount /dev from diskless snapshot, use tmpfs instead
+  (patch by Ondrej Valousek, bz#406711)
+- few fixes for mkdiskless (bz#412401)
+- fix NFS4 mounting on diskless clients (bz#410411)
+- fix permissions of /tftpboot/linux-install
+- fix bad SELinux context of linux-install/*/vmlinuz
+
 * Wed Oct 17 2007 Radek Brich <rbrich at redhat.com> - 0.1.42-1
 - transition to initramfs, patch by Bernardo Innocenti (bugs #204877, #248979)
 - additional checks for pxeos/pxeboot (bug #203788)




More information about the fedora-extras-commits mailing list