SliTaz Repositories

     1.1 --- a/init	Sat Jun 02 13:49:20 2012 +0200
     1.2 +++ b/init	Sat Jun 30 21:25:09 2012 +0200
     1.3 @@ -2,7 +2,7 @@
     1.4  
     1.5  success()
     1.6  {
     1.7 -	cat > /tmp/init
     1.8 +	cat > /run/init
     1.9  	[ -d /proc/sys ] && umount /proc
    1.10  	echo -e "\\033[70G[ \\033[1;32mOK\\033[0;39m ]"
    1.11  	exit
    1.12 @@ -10,7 +10,7 @@
    1.13  
    1.14  launch_init()
    1.15  {
    1.16 -	mount --move /tmp /mnt/tmp
    1.17 +	mount --move /run /mnt/run
    1.18  	success <<EOT
    1.19  exec /sbin/switch_root mnt /sbin/init
    1.20  EOT
    1.21 @@ -85,9 +85,9 @@
    1.22  }
    1.23  
    1.24  if [ "$1" != "logged" ]; then
    1.25 -	mount -t tmpfs tmpfs /tmp
    1.26 -	/init logged 2>&1 | tee /tmp/boot.log
    1.27 -	. /tmp/init
    1.28 +	mount -t tmpfs tmpfs /run
    1.29 +	/init logged 2>&1 | tee /run/boot.log
    1.30 +	. /run/init
    1.31  else
    1.32  mount -t proc proc /proc
    1.33  mount -t sysfs sysfs /sys
    1.34 @@ -157,13 +157,13 @@
    1.35  	subroot="/$(sed 's/.*subroot=\([^ ]*\).*/\1/' < /proc/cmdline)" &&
    1.36  	echo -n "Chrooting to $subroot..."
    1.37  	mount --move /dev/pts /mnt$subroot/dev/pts
    1.38 -	tmp=$subroot/tmp
    1.39 -	mount --move /tmp /mnt$tmp
    1.40 +	run=$subroot/run
    1.41 +	mount --move /run /mnt$run
    1.42  	cp $(LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so /usr/sbin/chroot | sed \
    1.43 -	     's|.*=> \(/lib/l[^ ]*\).*|\1|;/^\//!d') /usr/sbin/chroot /mnt$tmp
    1.44 +	     's|.*=> \(/lib/l[^ ]*\).*|\1|;/^\//!d') /usr/sbin/chroot /mnt$run
    1.45  	success <<EOT
    1.46 -export LD_LIBRARY_PATH=$tmp:/lib
    1.47 -exec /sbin/switch_root mnt $tmp/$(cd /mnt$tmp ; ls ld-*) $tmp/chroot $subroot /sbin/init
    1.48 +export LD_LIBRARY_PATH=$run:/lib
    1.49 +exec /sbin/switch_root mnt $run/$(cd /mnt$run ; ls ld-*) $run/chroot $subroot /sbin/init
    1.50  EOT
    1.51  fi
    1.52  echo -n "Switching / to tmpfs"
    1.53 @@ -172,7 +172,7 @@
    1.54  free=$(busybox free | busybox awk '/Mem:/ { print int(($4*100)/$3) }')
    1.55  umount /proc
    1.56  [ -n "$size" ] || size="-o size=90%"
    1.57 -echo "exec /sbin/init" > /tmp/init
    1.58 +echo "exec /sbin/init" > /run/init
    1.59  if [ $free -lt 100 ] || ! mount -t tmpfs $size tmpfs /mnt; then
    1.60  	echo -e "\\033[70G[ \\033[1;33mSkipped\\033[0;39m]"
    1.61  	exit