kadischi/post_install_scripts 02install.sh, 1.18, 1.19 08symlink.sh, 1.3, 1.4

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9780/kadischi/post_install_scripts

Modified Files:
	02install.sh 08symlink.sh 
Log Message:
Use NASH exclusively, remove Busybox


Index: 02install.sh
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/02install.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- 02install.sh	4 May 2007 10:50:40 -0000	1.18
+++ 02install.sh	16 May 2007 00:44:56 -0000	1.19
@@ -17,14 +17,15 @@
 inst readonly-halt etc/init.d/
 inst readonly-root etc/sysconfig/
 inst rc.local etc/rc.d/
-cp $LIBEXECDIR/kadischi/scanswap $DSTDIR/usr/sbin/
-cp $LIBEXECDIR/kadischi/eject-live-cd $DSTDIR/sbin/
+
+cp $DSTDIR/usr/libexec/kadischi/scanswap $DSTDIR/usr/sbin/
+cp $DSTDIR/usr/libexec/kadischi/eject-live-cd $DSTDIR/sbin/
 
 /bin/mkdir -p $DSTDIR/root/.config/autostart
 inst ../desktop/userhome.sh usr/sbin/
 inst ../desktop/userhome.desktop root/.config/autostart/
-chmod 755 $DSTDIR/usr/sbin/userhome.sh
-/bin/rpm -q kadischi --root $DSTDIR
+
+/bin/rpm -q kadischi --root $DSTDIR >/dev/null 2>&1
 if [ "$?" -eq "0" ]; then
     inst ../desktop/install.desktop usr/share/applications/
 fi


Index: 08symlink.sh
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/08symlink.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 08symlink.sh	11 May 2007 14:56:53 -0000	1.3
+++ 08symlink.sh	16 May 2007 00:44:56 -0000	1.4
@@ -22,7 +22,6 @@
 /usr/sbin/chroot $SYSDIR /bin/ln -s /sbin/mkswap /usr/sbin/mkswap
 /usr/sbin/chroot $SYSDIR /bin/ln -s /sbin/mkdosfs /usr/sbin/mkdosfs
 /usr/sbin/chroot $SYSDIR /bin/ln -s /sbin/mdadm /usr/sbin/mdadm
-/usr/sbin/chroot $SYSDIR /bin/ln -s /sbin/lvm /usr/sbin/lvm
 
 # Network tools
 /usr/sbin/chroot $SYSDIR /bin/ln -s /sbin/ifconfig /usr/sbin/ifconfig