FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe"
DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "5.3-alpha"
+DISTRO_VERSION = "5.4-alpha"
DISTRO_TYPE = "beta"
TARGET_FPU = "soft"
5.3:
Replaced maintenance mode with code to allow entry into RedBoot Upgrade Mode.
+
+5.4:
+
+Removed all maintenance mode support, and also removed support for rootfs on
+jffs2 but packages on external disk (it's either all or nothing).
+Removed unused /mnt/sda1, /mnt/sda2, /mnt/sdb1, and /mnt/sdb2.
+Disabled the download process (superceded by upgrade mode).
+Disabled the generation of the "ourtelnetrescue" user (too insecure).
+Added disk auto-wait countdown to /linuxrc (courtesy of glc).
-/bin/echo "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64
-/bin/echo "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128
+
-+if ( [ ! -f /.ramdisk ] && [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then
++if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then
+ /bin/echo "Creating ramfs for /dev:"
+ /bin/mount -t ramfs ramfs /mnt/tmpmnt
+ /bin/cp -rp /dev/* /mnt/tmpmnt/
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc~ 2004-11-21 21:43:35.000000000 +1030
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-11-21 21:49:54.000000000 +1030
+@@ -6,2 +6,5 @@
+ mount -t proc proc /proc
+ mount -o remount,rw /dev/root /
++
++sed -n -e '/^#/p' < /etc/fstab > /etc/mtab
++
# Determine the desired rootfs based on user flag files.
-if [ -f /.ramdisk ] ; then
- /bin/echo "Preferred root device is /dev/ram0 (maintenence)"
- mounted=/mnt
- prefroot=maintenence
-elif [ -f /.sda1root ] ; then
+if [ -f /.sda1root ] ; then
/bin/echo "Preferred root device is /dev/sda1 (disk 1)"
mounted=/mnt
prefroot=sda1
/bin/mount -t proc proc /proc
if [ $prefroot = "sda1" -o $prefroot = "sda2" -o $prefroot = "sdb1" -o $prefroot = "sdb2" ] ; then
- /bin/echo "Sleeping 10sec while waiting for disk..."
- sleep 10
+ /bin/echo "Sleeping while waiting for disk..."
+ cnt=20
+ while [ $cnt -gt 0 ] ; do
+ echo -ne "\r$cnt "
+ sleep 1
+ [ $prefroot = "sda1" ] && [ -f /proc/hd_conn ] && cnt=0
+ [ $prefroot = "sda2" ] && [ -f /proc/hd_conn ] && cnt=0
+ [ $prefroot = "sdb1" ] && [ -f /proc/hd2_conn ] && cnt=0
+ [ $prefroot = "sdb2" ] && [ -f /proc/hd2_conn ] && cnt=0
+ cnt=`expr $cnt - 1`
+ done
+ echo
/bin/mount -rt ext3 /dev/$prefroot /mnt
if [ -L /mnt/sbin/init -o -x /mnt/sbin/init -o \
-L /mnt/bin/init -o -x /mnt/bin/init ] ; then
fi
fi
-if [ $prefroot = "maintenence" ] ; then
- /bin/dd if=/dev/zero of=/dev/ram0 bs=1k count=12k 2>/dev/null
- /usr/bin/mke2fs -m 0 /dev/ram0 12288
- /bin/mount -t ext2 /dev/ram0 /mnt
- ( /usr/bin/find . -print0 -mount | /usr/bin/cpio -p -0 -d -m -u /mnt )
- /bin/rm -f /mnt/linuxrc
- /bin/mkdir /mnt/mnt/backup /mnt/mnt/repair /mnt/mnt/tmpmnt
-fi
-
if [ $prefroot = "nfsroot" ] ; then
sysconflen=`/bin/dd if=/dev/mtd1 bs=4 count=1 2>/dev/null | /usr/bin/hexdump -n 6 -e '"%02d"'`
--- nslu2-linksys-ramdisk-2.3r25/etc/rc~ 2004-07-27 23:37:55.000000000 -0400
+++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-09-01 21:47:47.000000000 -0400
-@@ -1,4 +1,41 @@
+@@ -1,4 +1,7 @@
## Simple beta script to verify csr
+
+if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi
/usr/bin/Set_Led r_blinking &
mount -t proc proc /proc
mount -o remount,rw /dev/root /
-+
-+if [ -f /.ramdisk ] ; then
-+ echo "Root filesystem is running in maintenance mode ..."
-+elif ( [ -f /.sda1root ] || [ -f /.sdb1root ] || [ -f /.sda2root ] || [ -f /.sdb2root ] ) ; then
-+ echo "Root filesystem is running from an external disk ..."
-+else
-+ echo "Root filesystem is running from jffs2 ..."
-+fi
-+
-+# Wait for the USB disks to be recognised.
-+sleep 10
-+
-+if ( [ -f /proc/hd_conn ] ) ; then
-+ if ( [ -f /.sda1root ] ) ; then
-+ /bin/mount -t ext3 /dev/sda1 /share/hdd/data
-+ /bin/rm -rf /mnt/sda1 ; /bin/ln -s /share/hdd/data /mnt/sda1
-+ fi
-+ if ( [ -f /.sda2root ] ) ; then
-+ /bin/mount -t ext3 /dev/sda2 /share/hdd/conf
-+ /bin/rm -rf /mnt/sda2 ; /bin/ln -s /share/hdd/conf /mnt/sda2
-+ fi
-+fi
-+
-+if ( [ -f /proc/hd2_conn ] ) ; then
-+ if ( [ -f /.sdb1root ] ) ; then
-+ /bin/mount -t ext3 /dev/sdb2 /share/flash/data
-+ /bin/rm -rf /mnt/sdb1 ; /bin/ln -s /share/flash/data /mnt/sdb1
-+ fi
-+ if ( [ -f /.sdb2root ] ) ; then
-+ /bin/mount -t ext3 /dev/sdb2 /share/flash/conf
-+ /bin/rm -rf /mnt/sdb2 ; /bin/ln -s /share/flash/conf /mnt/sdb2
-+ fi
-+fi
-+
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1~ 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2004-09-01 21:56:17.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++if ( [ -f /unslung/rc.1 ] && . /unslung/rc.1 ) ; then return 0 ; fi
++
+ #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04
+ /bin/echo "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status
+
+@@ -17,6 +19,8 @@
+ /bin/echo "Starting Crond :"; . /etc/rc.d/rc.crond
+ /bin/echo "Starting Rest Task :"; . /etc/rc.d/rc.local
+
++/bin/echo "Starting UNSLUNG Packages:"; ( . /etc/rc.d/rc.unslung-start )
++
+ /usr/bin/Set_Led ready
+ /usr/bin/Set_Led beep1
+ /bin/echo "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null
+#!/bin/sh
+
+if ( [ -f /unslung/rc.bootbin ] && . /unslung/rc.bootbin ) ; then return 0 ; fi
+
+/sbin/rc.bootbin
+
+return 0
\ No newline at end of file
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond 2004-09-01 21:56:37.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++if ( [ -r /unslung/rc.crond ] && . /unslung/rc.crond ) ; then return 0 ; fi
++
+ if [ -n "`pidof crond`" ] ;then
+ /bin/killall crond 2>/dev/null
+ fi
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt 2004-09-01 21:57:01.000000000 -0400
+@@ -1,4 +1,9 @@
+ #!/bin/sh
++
++if ( [ -r /unslung/rc.halt ] && . /unslung/rc.halt ) ; then return 0 ; fi
++
++/bin/echo "Stopping UNSLUNG Packages:"; ( . /etc/rc.d/rc.unslung-stop )
++
+ /bin/killall -2 upnpd &>/dev/null
+ /bin/killall nmbd &>/dev/null
+ /bin/killall smbd &>/dev/null
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local 2004-09-01 21:57:17.000000000 -0400
+@@ -1,5 +1,9 @@
+ #!/bin/sh
++
+ HOSTNAME=`hostname`
++
++if ( [ -r /unslung/rc.local ] && . /unslung/rc.local ) ; then return 0 ; fi
++
+ /usr/sbin/CheckResetButton 2>/dev/null
+ /usr/sbin/CheckPowerButton 2>/dev/null
+ /usr/sbin/do_umount 2>/dev/null
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules 2004-09-01 21:57:34.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.modules ] && . /unslung/rc.modules ) ; then return 0 ; fi
++
+ insmod pbuttons &>/dev/null
+ insmod rbuttons &>/dev/null
+ insmod x1226-rtc &>/dev/null
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network 2004-09-01 21:57:46.000000000 -0400
+@@ -1,3 +1,6 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.network ] && . /unslung/rc.network ) ; then return 0 ; fi
++
+ /sbin/ifup; #check_status
+ /bin/echo "call rc.network!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset 2004-09-01 21:57:57.000000000 -0400
+@@ -1,3 +1,6 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.quickset ] && . /unslung/rc.quickset ) ; then return 0 ; fi
++
+ /usr/sbin/QuickSet; check_status
+ /usr/sbin/USB_Detect; check_status
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota 2004-09-01 21:58:08.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++if ( [ -f /unslung/rc.quota ] && . /unslung/rc.quota ) ; then return 0 ; fi
++
+ # Check and turn on disk quota.
+ if [ -x "/usr/bin/quotacheck" ]
+ then
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot 2004-09-01 21:58:19.000000000 -0400
+@@ -1,4 +1,9 @@
+ #!/bin/sh
++
++if ( [ -r /unslung/rc.reboot ] && . /unslung/rc.reboot ) ; then return 0 ; fi
++
++/bin/echo "Stopping UNSLUNG Packages:"; ( . /etc/rc.d/rc.unslung-stop )
++
+ /bin/killall -2 upnpd 2>/dev/null
+ sleep 4
+ /sbin/ifdown ixp0
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare 2004-09-01 21:58:36.000000000 -0400
+@@ -1,2 +1,5 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.reset_usrgrpshare ] && . /unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi
++
+ /usr/sbin/reset_ugs;
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone 2004-09-01 21:58:47.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.rstimezone ] && . /unslung/rc.rstimezone ) ; then return 0 ; fi
++
+ #TIME=`/usr/sbin/hwclock`
+ /usr/sbin/Set_TimeZone >/dev/null
+ #/bin/date -s "$TIME"
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba 2004-09-01 21:58:57.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.samba ] && . /unslung/rc.samba ) ; then return 0 ; fi
++
+ if [ -n "`pidof smbd`" ] ; then
+ killall smbd 2>/dev/null
+ fi
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit 2004-09-01 21:59:04.000000000 -0400
+@@ -1,7 +1,11 @@
+ #!/bin/sh
+-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
++export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin
++
+ . /etc/rc.d/rc.functions
+ . /etc/sysconfig/network
++
++if ( [ -f /unslung/rc.sysinit ] && . /unslung/rc.sysinit ) ; then return 0 ; fi
++
+ mkdir -p /var/lock/samba >/dev/null
+ /bin/echo "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64
+ /bin/echo "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd 2004-09-01 21:59:13.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.thttpd ] && . /unslung/rc.thttpd ) ; then return 0 ; fi
++
+ if [ -n "`pidof thttpd`" ] ;then
+ /bin/killall thttpd 2>/dev/null
+ fi
+#!/bin/sh
+
+if ( [ -f /unslung/rc.unslung-start ] && . /unslung/rc.unslung-start ) ; then return 0 ; fi
+
+# Start all init scripts in /opt/etc/init.d
+# executing them in numerical order.
+#
+for i in /opt/etc/init.d/S??* ;do
+
+ # Ignore dangling symlinks (if any).
+ [ ! -f "$i" ] && continue
+
+ case "$i" in
+ *.sh)
+ # Source shell script for speed.
+ (
+ trap - INT QUIT TSTP
+ set start
+ . $i
+ )
+ ;;
+ *)
+ # No sh extension, so fork subprocess.
+ $i start
+ ;;
+ esac
+done
+#!/bin/sh
+
+if ( [ -f /unslung/rc.unslung-stop ] && . /unslung/rc.unslung-stop ) ; then return 0 ; fi
+
+# Stop all init scripts in /opt/etc/init.d
+# executing them in numerical order.
+#
+for i in /opt/etc/init.d/K??* ;do
+
+ # Ignore dangling symlinks (if any).
+ [ ! -f "$i" ] && continue
+
+ case "$i" in
+ *.sh)
+ # Source shell script for speed.
+ (
+ trap - INT QUIT TSTP
+ set stop
+ . $i
+ )
+ ;;
+ *)
+ # No sh extension, so fork subprocess.
+ $i stop
+ ;;
+ esac
+done
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd.orig 2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd 2004-09-01 21:59:34.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.xinetd ] && . /unslung/rc.xinetd ) ; then return 0 ; fi
++
+ if [ -n "`pidof inetd`" ] ;then
+ killall inetd 2>/dev/null
+ # killall -9 inetd &>/dev/null
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1~ 2004-11-09 21:45:52.000000000 +1030
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2004-11-09 21:44:27.000000000 +1030
+@@ -27,6 +27,14 @@
+ #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04
+ /bin/echo "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status
+
++if ( [ -f /.ext3flash ] ) ; then
++ /bin/echo "Remounting /dev/sda1 as ext3flash:"
++ /bin/mount -o remount,rw,noatime /dev/sda1
++ /bin/echo "Remounting /dev/sda2 as ext3flash:"
++ /bin/mount -o remount,rw,noatime /dev/sda2
++ /bin/echo "Removing swap from ext3flash:"
++ /sbin/swapoff /dev/sda3
++fi
+
+ /bin/echo "Restore time and timezone:"; /etc/rc.d/rc.rstimezone; check_status
+ /bin/echo "Restore usrgrpshares:"; /etc/rc.d/rc.reset_usrgrpshare; check_status
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota~ 2004-11-11 00:05:21.000000000 +1030
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota 2004-11-11 00:04:52.000000000 +1030
+@@ -14,6 +14,11 @@
+ echo "Done."
+ fi
+
++if ( [ -f /.ext3flash ] ) ; then
++ /bin/echo "Remounting /dev/sda1 as ext3flash:"
++ /bin/mount -o remount,rw,noatime /dev/sda1
++fi
++
+ if [ -x "/usr/bin/quotaon" ]
+ then
+ echo "Turning on quota."
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1.orig 2005-01-16 09:37:41.000000000 +1030
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2005-01-16 09:42:09.000000000 +1030
+@@ -33,6 +33,10 @@
+ /bin/echo "Starting download:"; /usr/sbin/download
+ /bin/echo "Starting INET Server:"; . /etc/rc.d/rc.xinetd; check_status
++if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then
+ /bin/echo "Creating ramfs for /tmp:"; mount -t ramfs none /tmp -o maxsize=512
++fi
++/bin/rm -rf /tmp/* /mnt/backup/*
++/bin/chmod 1777 /tmp
+ /bin/echo "Starting QuickSet Daemon :"; . /etc/rc.d/rc.quickset
+ /bin/echo "Starting Crond :"; . /etc/rc.d/rc.crond
+ /bin/echo "Starting Rest Task :"; . /etc/rc.d/rc.local
if [ $# -eq 1 ] ; then
if [ "$1" = "disk1" ] ; then
targ=/share/hdd/data
- copy=true
flag=.sda1root
elif [ "$1" = "disk2" ] ; then
targ=/share/flash/data
- copy=true
flag=.sdb1root
elif [ "$1" = "hdd-data" ] ; then
targ=/share/hdd/data
- copy=true
flag=.sda1root
elif [ "$1" = "hdd-conf" ] ; then
targ=/share/hdd/conf
- copy=true
flag=.sda2root
elif [ "$1" = "flash-data" ] ; then
targ=/share/flash/data
- copy=true
flag=.sdb1root
elif [ "$1" = "flash-conf" ] ; then
targ=/share/flash/conf
- copy=true
flag=.sdb2root
- elif [ "$1" = "jffs2-hdd-data" ] ; then
- targ=/share/hdd/data
- copy=
- elif [ "$1" = "jffs2-hdd-conf" ] ; then
- targ=/share/hdd/conf
- copy=
- elif [ "$1" = "jffs2-flash-data" ] ; then
- targ=/share/flash/data
- copy=
- elif [ "$1" = "jffs2-flash-conf" ] ; then
- targ=/share/flash/conf
- copy=
else
echo $usage
exit 1
cd /
-if [ -z "$copy" ] ; then
+# Save the existing ipkg database.
- # Ensure /opt is there.
-
- if [ ! -d $targ/opt ] ; then
- echo "Creating new /opt directory on target disk."
- mkdir -p $targ/opt
- else
- echo "Preserving existing /opt directory on target disk."
- fi
-
- if [ -d /opt -a ! -h /opt ] ; then
- echo "Copying existing /opt directory from root disk to target disk."
- tar cf - opt | ( cd $targ ; tar xf - )
- mv /opt /opt.old
- fi
-
- echo "Linking /opt directory from target disk to root disk."
- rm -f /opt ; ln -s $targ/opt /opt
-
- # Ensure /usr/lib/ipkg is there.
-
- if [ ! -d $targ/usr/lib/ipkg ] ; then
- echo "Creating new /usr/lib/ipkg directory on target disk."
- mkdir -p $targ/usr/lib/ipkg
- fi
-
- if [ ! -f $targ/usr/lib/ipkg/status -a -d /usr/lib/ipkg -a ! -h /usr/lib/ipkg ] ; then
- echo "Copying existing /usr/lib/ipkg directory from root disk to target disk."
- tar cf - usr/lib/ipkg | ( cd $targ ; tar xf - )
- else
- echo "Preserving existing ipkg database on target disk."
- fi
-
- if [ -d /usr/lib/ipkg -a ! -h /usr/lib/ipkg ] ; then
- echo "Saving /usr/lib/ipkg directory on root disk in /usr/lib/ipkg.old"
- rm -rf /usr/lib/ipkg.old
- mv /usr/lib/ipkg /usr/lib/ipkg.old
- fi
-
- echo "Linking /usr/lib/ipkg directory from target disk to root disk."
- rm -f /usr/lib/ipkg ; ln -s $targ/usr/lib/ipkg /usr/lib/ipkg
-
- echo "Linking /usr/bin/ipkg executable on root disk."
- rm -f /usr/bin/ipkg ; ln -s /usr/bin/ipkg-cl /usr/bin/ipkg
-
-else
-
- # Save the existing ipkg database.
-
- rm -rf $targ/usr/lib/ipkg.old
- if [ -f $targ/usr/lib/ipkg/status ] ; then
+rm -rf $targ/usr/lib/ipkg.old
+if [ -f $targ/usr/lib/ipkg/status ] ; then
mv $targ/usr/lib/ipkg $targ/usr/lib/ipkg.old
- fi
+fi
- # Copy the complete rootfs to the target.
+# Copy the complete rootfs to the target.
- echo "Copying the complete rootfs from / to $targ."
- /usr/bin/find / -print0 -mount | /usr/bin/cpio -p -0 -d -m -u $targ
- rm -rf $targ/dev ; mv $targ/dev.state $targ/dev
- rm -rf $targ/var ; mv $targ/var.state $targ/var
+echo "Copying the complete rootfs from / to $targ."
+/usr/bin/find / -print0 -mount | /usr/bin/cpio -p -0 -d -m -u $targ
+rm -rf $targ/dev ; mv $targ/dev.state $targ/dev
+rm -rf $targ/var ; mv $targ/var.state $targ/var
- # Copy over the existing ipkg database.
+# Copy over the existing ipkg database.
- if [ -f $targ/usr/lib/ipkg.old/status ] ; then
+if [ -f $targ/usr/lib/ipkg.old/status ] ; then
echo "Preserving existing ipkg database on target disk."
( cd $targ/usr/lib/ipkg.old ; tar cf - . ) | ( cd $targ/usr/lib/ipkg ; tar xf - )
- fi
-
- echo "Linking /usr/bin/ipkg executable on target disk."
- rm -f $targ/usr/bin/ipkg ; ln -s /usr/bin/ipkg-cl $targ/usr/bin/ipkg
+fi
- # Create the boot flag file.
+echo "Linking /usr/bin/ipkg executable on target disk."
+rm -f $targ/usr/bin/ipkg ; ln -s /usr/bin/ipkg-cl $targ/usr/bin/ipkg
- rm -f /.sd??root $targ/.sd??root /.ramdisk $targ/.ramdisk
+# Create the boot flag file.
- echo "Creating /$flag to direct switchbox to boot from $targ."
- echo > /$flag
- echo > $targ/$flag
+rm -f /.sd??root $targ/.sd??root
-fi
+echo "Creating /$flag to direct switchbox to boot from $targ."
+echo > /$flag
+echo > $targ/$flag
exit 0
SECTION = "base"
-PR = "r6"
+PR = "r8"
DEPENDS = "nslu2-linksys-libs"
file://initialise-mtab.patch;patch=1 \
file://wait-for-quotacheck.patch;patch=1 \
file://mount_usbdevfs.patch;patch=1 \
+ file://security-fixes.patch;patch=1 \
file://upgrade.htm file://upgrade.cgi \
file://rc.bootbin \
"
git.openpandora.org / openembedded.git / commitdiff