slitaz-boot-scripts rev 416
Use 'action' before 'status' in pair
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Nov 27 12:48:01 2015 +0200 (2015-11-27) |
| parents | cdb1a0f6966a |
| children | 802121f86123 |
| files | etc/init.d/bootopts.sh etc/init.d/network.sh etc/init.d/rcS etc/init.d/system.sh init |
line diff
1.1 --- a/etc/init.d/bootopts.sh Sat Nov 07 02:33:50 2015 +0200 1.2 +++ b/etc/init.d/bootopts.sh Fri Nov 27 12:48:01 2015 +0200 1.3 @@ -41,7 +41,7 @@ 1.4 cp /etc/slitaz/applications.conf /etc/skel/.config/slitaz 1.5 fi 1.6 1.7 - echo -n "Configuring user and group: $USER..." 1.8 + action 'Configuring user and group: $USER...' 1.9 adduser -D -s /bin/sh -g 'SliTaz User' -G users -h /home/$USER $USER 1.10 passwd -d $USER >/dev/null 1.11 for group in audio cdrom video tty plugdev disk; do 1.12 @@ -73,13 +73,13 @@ 1.13 kmap=*) 1.14 # Check for a specified keymap (kmap=*). 1.15 KEYMAP=${opt#kmap=} 1.16 - echo -n "Setting system keymap to: $KEYMAP..." 1.17 + action 'Setting system keymap to: $KEYMAP...' 1.18 echo "$KEYMAP" > /etc/keymap.conf 1.19 status ;; 1.20 font=*) 1.21 # Check for a specified console font (font=*). 1.22 FONT=${opt#font=} 1.23 - echo -n "Setting console font to: $FONT..." 1.24 + action 'Setting console font to: $FONT...' 1.25 for con in 1 2 3 4 5 6; do 1.26 setfont $FONT -C /dev/tty$con 1.27 done 1.28 @@ -182,7 +182,7 @@ 1.29 [ -z "$PKGDEV" -a -L /dev/cdrom ] && \ 1.30 PKGDEV=$(blkid /dev/cdrom | grep "$PKGSIGN" | cut -d: -f1) 1.31 if [ -n "$PKGDEV" ]; then 1.32 - echo -n "Mounting packages archive from $PKGDEV..." 1.33 + action 'Mounting packages archive from $PKGDEV...' 1.34 mkdir -p /packages; mount -t iso9660 -o ro $PKGDEV /packages 1.35 status 1.36 /packages/install.sh
2.1 --- a/etc/init.d/network.sh Sat Nov 07 02:33:50 2015 +0200 2.2 +++ b/etc/init.d/network.sh Fri Nov 27 12:48:01 2015 +0200 2.3 @@ -22,12 +22,12 @@ 2.4 2.5 boot() { 2.6 # Set hostname 2.7 - echo -n "Setting hostname to: $(cat /etc/hostname)" 2.8 + action "Setting hostname to: $(cat /etc/hostname)" 2.9 /bin/hostname -F /etc/hostname 2.10 status 2.11 2.12 # Configure loopback interface 2.13 - echo -n 'Configuring loopback...' 2.14 + action 'Configuring loopback...' 2.15 /sbin/ifconfig lo 127.0.0.1 up 2.16 /sbin/route add -net 127.0.0.0 netmask 255.0.0.0 dev lo 2.17 status 2.18 @@ -59,7 +59,7 @@ 2.19 # notwithstanding to priority when scan_ssid=1 2.20 current_ssid="$(wpa_cli list_networks 2>/dev/null | fgrep '[CURRENT]' | cut -f2)" 2.21 if [ "$current_ssid" != "$WIFI_ESSID" ]; then 2.22 - echo "Connecting to $WIFI_ESSID..." 2.23 + action 'Connecting to $WIFI_ESSID...' 2.24 for i in $(seq 5); do 2.25 index=$(wpa_cli list_networks 2>/dev/null | \ 2.26 grep -m1 -F $'\t'$WIFI_ESSID$'\t' | head -n1 | cut -f1) 2.27 @@ -96,7 +96,7 @@ 2.28 /etc/network.conf 2.29 fi 2.30 2.31 - echo -n "Configuring Wi-Fi interface $WIFI_INTERFACE..." 2.32 + action 'Configuring Wi-Fi interface $WIFI_INTERFACE...' 2.33 ifconfig $WIFI_INTERFACE up 2>/dev/null 2.34 if iwconfig $WIFI_INTERFACE | fgrep -q 'Tx-Power'; then 2.35 iwconfig $WIFI_INTERFACE txpower on
3.1 --- a/etc/init.d/rcS Sat Nov 07 02:33:50 2015 +0200 3.2 +++ b/etc/init.d/rcS Fri Nov 27 12:48:01 2015 +0200 3.3 @@ -20,12 +20,13 @@ 3.4 colorize 34 'Processing: /etc/init.d/rcS...' 3.5 3.6 # Mount /proc 3.7 -echo -n 'Mounting proc filesystem on /proc' 3.8 -mount proc && status 3.9 +action 'Mounting proc filesystem on /proc' 3.10 +mount proc 3.11 +status 3.12 3.13 # Trigger Udev and handle hotplug events 3.14 if [ "$UDEV" == "yes" ]; then 3.15 - echo -n 'Mounting devtmpfs filesystem on: /dev' 3.16 + action 'Mounting devtmpfs filesystem on: /dev' 3.17 mount -t devtmpfs devtmpfs /dev 3.18 status 3.19 3.20 @@ -40,7 +41,7 @@ 3.21 # Disable hotplug helper since udevd listen to netlink 3.22 echo '' > /proc/sys/kernel/hotplug 3.23 else 3.24 - echo -n 'Executing mdev -s to populate /dev...' 3.25 + action 'Executing mdev -s to populate /dev...' 3.26 mdev -s && echo 'mdev' > /proc/sys/kernel/hotplug 3.27 status 3.28 fi 3.29 @@ -77,7 +78,7 @@ 3.30 3.31 # Parse cmdline args for earlier boot options. All other boot options 3.32 # are in /etc/init./bootopts.sh. 3.33 -echo -n 'Searching for early boot options...' 3.34 +action 'Searching for early boot options...' 3.35 for opt in $(cat /proc/cmdline); do 3.36 case $opt in 3.37 modprobe=*) 3.38 @@ -95,7 +96,7 @@ 3.39 # Clean up the system and set up tmp dirs. */run/* are tmpfs so they are 3.40 # cleaned up at shutdown. 3.41 if [ "$CLEAN_UP_SYSTEM" == 'yes' ]; then 3.42 - echo -n 'Cleaning up the system...' 3.43 + action 'Cleaning up the system...' 3.44 rm -rf /tmp 3.45 mkdir -p /tmp/.X11-unix /tmp/.ICE-unix 3.46 chmod -R 1777 /tmp 3.47 @@ -108,7 +109,7 @@ 3.48 if [ "$MODPROBE" ]; then 3.49 mods=$(sed -e 's/.* modprobe=\([^ ]*\).*/\1/' -e 's/,/\n/g' < /proc/cmdline) 3.50 for i in $mods; do 3.51 - echo -n "Loading kernel module: $i" 3.52 + action 'Loading kernel module: $i' 3.53 modprobe $i 3.54 status 3.55 done 3.56 @@ -131,7 +132,7 @@ 3.57 CONFIG="" 3.58 fi 3.59 fi 3.60 - echo -n "Source $SCRIPT from $DEVICE..." 3.61 + action 'Source $SCRIPT from $DEVICE...' 3.62 if [ -n "$CONFIG" ]; then 3.63 . /mnt/$SCRIPT 3.64 umount /mnt 2> /dev/null || true 3.65 @@ -141,22 +142,22 @@ 3.66 3.67 # Mount /proc/bus/usb 3.68 if [ -d /proc/bus/usb ]; then 3.69 - echo -n 'Mounting usbfs filesystem on: /proc/bus/usb' 3.70 + action 'Mounting usbfs filesystem on: /proc/bus/usb' 3.71 mount -t usbfs usbfs /proc/bus/usb 3.72 status 3.73 fi 3.74 3.75 # Start syslogd and klogd 3.76 -echo -n 'Starting system log daemon: syslogd...' 3.77 -syslogd -s $SYSLOGD_ROTATED_SIZE && status 3.78 -echo -n 'Starting kernel log daemon: klogd...' 3.79 -klogd && status 3.80 +action 'Starting system log daemon: syslogd...' 3.81 +syslogd -s $SYSLOGD_ROTATED_SIZE; status 3.82 +action 'Starting kernel log daemon: klogd...' 3.83 +klogd; status 3.84 3.85 # Load all modules listed in config file 3.86 if [ "$LOAD_MODULES" ]; then 3.87 colorize 33 'Loading Kernel modules...' 3.88 for mod in $LOAD_MODULES; do 3.89 - echo -n "Loading module: $mod" 3.90 + action 'Loading module: $mod' 3.91 modprobe $mod 3.92 status 3.93 done 3.94 @@ -171,7 +172,7 @@ 3.95 # Call udevadm trigger to ensure /dev is fully populated now that all 3.96 # modules are loaded. 3.97 if [ "$UDEV" == 'yes' ]; then 3.98 - echo -n 'Triggering udev events: --action=add' 3.99 + action 'Triggering udev events: --action=add' 3.100 udevadm trigger --action=add 3.101 status 3.102 fi
4.1 --- a/etc/init.d/system.sh Sat Nov 07 02:33:50 2015 +0200 4.2 +++ b/etc/init.d/system.sh Fri Nov 27 12:48:01 2015 +0200 4.3 @@ -30,9 +30,10 @@ 4.4 echo -e 'LANG=POSIX\nLC_ALL=POSIX' > /etc/locale.conf 4.5 fi 4.6 . /etc/locale.conf 4.7 -echo -n "Setting system locale: $LANG" 4.8 +action 'Setting system locale: $LANG' 4.9 export LC_ALL=$LANG 4.10 -. /lib/libtaz.sh && status 4.11 +. /lib/libtaz.sh 4.12 +status 4.13 4.14 # Keymap config: Default to us in live mode if kmap= was not used. 4.15 if [ ! -s '/etc/keymap.conf' ]; then 4.16 @@ -40,7 +41,7 @@ 4.17 echo 'us' > /etc/keymap.conf 4.18 fi 4.19 kmap=$(cat /etc/keymap.conf) 4.20 -echo -n "Loading console keymap: $kmap" 4.21 +action 'Loading console keymap: $kmap' 4.22 /sbin/tazkeymap $kmap >/dev/null 4.23 status 4.24 4.25 @@ -69,8 +70,9 @@ 4.26 done 4.27 fi 4.28 if grep -q swap /etc/fstab; then 4.29 - echo -n 'Activating swap memory...' 4.30 - swapon -a && status 4.31 + action 'Activating swap memory...' 4.32 + swapon -a 4.33 + status 4.34 fi 4.35 4.36 # Start TazPanel 4.37 @@ -84,10 +86,10 @@ 4.38 if [ -n "$DRIVER" ]; then 4.39 case "$DRIVER" in 4.40 no) 4.41 - echo -n 'Removing all sound kernel modules...' 4.42 + action 'Removing all sound kernel modules...' 4.43 rm -rf /lib/modules/$(uname -r)/kernel/sound 4.44 status 4.45 - echo -n 'Removing all sound packages...' 4.46 + action 'Removing all sound packages...' 4.47 for i in $(grep -l '^DEPENDS=.*alsa-lib' /var/lib/tazpkg/installed/*/receipt) ; do 4.48 pkg=${i#/var/lib/tazpkg/installed/} 4.49 echo 'y' | tazpkg remove ${pkg%/*} > /dev/null
5.1 --- a/init Sat Nov 07 02:33:50 2015 +0200 5.2 +++ b/init Fri Nov 27 12:48:01 2015 +0200 5.3 @@ -50,121 +50,124 @@ 5.4 # isofs [LORAM] 5.5 # do not use squashfs filesystem images, but the cdrom filesystem only 5.6 5.7 -fail() 5.8 -{ 5.9 -echo -e '\033[70G[ \033[1;3'${1:-1mFailed}'\033[0;39m ]' 5.10 + 5.11 +fail() { 5.12 + echo -e '\033[70G[ \033[1;3'${1:-1mFailed}'\033[0;39m ]' 5.13 } 5.14 5.15 -quit() 5.16 -{ 5.17 -[ -d /mnt$4/etc ] || return 5.18 -[ -n "$4" ] || busybox mount /mnt -o remount,ro 5.19 -busybox mount --move /run /mnt/${1:-run} 5.20 -cat>/run/init<<EOT 5.21 + 5.22 +quit() { 5.23 + [ -d /mnt$4/etc ] || return 5.24 + [ -n "$4" ] || busybox mount /mnt -o remount,ro 5.25 + busybox mount --move /run /mnt/${1:-run} 5.26 + cat > /run/init <<EOT 5.27 $2 5.28 x=/sbin/switch_root 5.29 [ -x \$x ] && exec \$x mnt $3 /sbin/init 5.30 EOT 5.31 -fail 2mDone 5.32 -exit 5.33 + fail 2mDone 5.34 + exit 5.35 } 5.36 5.37 -arg() 5.38 -{ 5.39 -grep -q $1 /proc/cmdline 5.40 + 5.41 +arg() { 5.42 + grep -q $1 /proc/cmdline 5.43 } 5.44 5.45 -got() 5.46 -{ 5.47 -arg $1= && root="$(sed "s/.*$1=\([^ ]*\).*/\1/" </proc/cmdline)" 5.48 + 5.49 +got() { 5.50 + arg $1= && root="$(sed "s/.*$1=\([^ ]*\).*/\1/" </proc/cmdline)" 5.51 } 5.52 5.53 -msg() 5.54 -{ 5.55 -echo "Switching / to $1..." 5.56 + 5.57 +msg() { 5.58 + echo "Switching / to $1..." 5.59 } 5.60 5.61 -use() 5.62 -{ 5.63 -got $1 && msg "$1 $root" 5.64 + 5.65 +use() { 5.66 + got $1 && msg "$1 $root" 5.67 } 5.68 5.69 -mnt() 5.70 -{ 5.71 -r=$(busybox blkid 2> /dev/null | sed "s|\"||g;/${root//[^a-zA-Z0-9]/.}/!d;s|:.*||;q") 5.72 -r=${r:-$root} 5.73 -if [ ! -b $r ]; then 5.74 - r=${r#/dev/} 5.75 - r=/dev/${r%%/*} 5.76 -fi 5.77 -d=${root#*$r} 5.78 -busybox mount $r $1 && return 5.79 -w=$(cat /sys/module/usb_storage/parameters/delay_use) 5.80 -w=$((1+${w:-2})) 5.81 -echo -n "Sleep $w seconds..." 5.82 -sleep $w 5.83 -busybox mount $r $1 5.84 + 5.85 +mnt() { 5.86 + r=$(busybox blkid 2> /dev/null | sed "s|\"||g;/${root//[^a-zA-Z0-9]/.}/!d;s|:.*||;q") 5.87 + r=${r:-$root} 5.88 + if [ ! -b $r ]; then 5.89 + r=${r#/dev/} 5.90 + r=/dev/${r%%/*} 5.91 + fi 5.92 + d=${root#*$r} 5.93 + busybox mount $r $1 && return 5.94 + w=$(cat /sys/module/usb_storage/parameters/delay_use) 5.95 + w=$((1+${w:-2})) 5.96 + echo -n "Sleep $w seconds..." 5.97 + sleep $w 5.98 + busybox mount $r $1 5.99 } 5.100 5.101 -mod() 5.102 -{ 5.103 -for i in $@; do 5.104 - echo "Loading module: $i" 5.105 - modprobe $i 2>/dev/null || busybox insmod $(find /lib/modules|sed "/$i.ko/!dq") 5.106 -done 5.107 + 5.108 +mod() { 5.109 + for i in $@; do 5.110 + echo "Loading module: $i" 5.111 + modprobe $i 2>/dev/null || busybox insmod $(find /lib/modules|sed "/$i.ko/!dq") 5.112 + done 5.113 } 5.114 5.115 -try() 5.116 -{ 5.117 -if [ ! -d /mnt/etc ] && got cryptoroot; then 5.118 - mod dm-mod dm-crypt aes-256 5.119 - d=${root#/dev/} 5.120 - l=crypto-$d 5.121 - if cryptsetup isLuks $root 2>/dev/null; then 5.122 - cryptsetup luksOpen $root $l 5.123 - else 5.124 - read -st 60 -p "Pass phrase : " p 5.125 - k=$(echo $p|hashalot -x -n 32 sha512) 5.126 - echo 0 $(cat $(find /sys/block|grep /$d/size))\ 5.127 - crypt aes-plain $k 0 $root 0|dmsetup create $l 5.128 + 5.129 +try() { 5.130 + if [ ! -d /mnt/etc ] && got cryptoroot; then 5.131 + mod dm-mod dm-crypt aes-256 5.132 + d=${root#/dev/} 5.133 + l=crypto-$d 5.134 + if cryptsetup isLuks $root 2>/dev/null; then 5.135 + cryptsetup luksOpen $root $l 5.136 + else 5.137 + read -st 60 -p "Pass phrase : " p 5.138 + k=$(echo $p|hashalot -x -n 32 sha512) 5.139 + echo 0 $(cat $(find /sys/block|grep /$d/size))\ 5.140 + crypt aes-plain $k 0 $root 0|dmsetup create $l 5.141 + fi 5.142 + busybox mount /dev/mapper/$l /mnt 5.143 fi 5.144 - busybox mount /dev/mapper/$l /mnt 5.145 -fi 5.146 -got subroot && return 5.147 -got loopfs && return 5.148 -if [ -d /mnt/etc ]; then 5.149 - for i in $@; do 5.150 - cp -a $i /mnt$(dirname $i) 5.151 - done 5.152 - quit 5.153 -fi 5.154 -fail 5.155 + got subroot && return 5.156 + got loopfs && return 5.157 + if [ -d /mnt/etc ]; then 5.158 + for i in $@; do 5.159 + cp -a $i /mnt$(dirname $i) 5.160 + done 5.161 + quit 5.162 + fi 5.163 + fail 5.164 } 5.165 5.166 -lvm() 5.167 -{ 5.168 -use lvmroot || return 5.169 -mod dm-mod 5.170 -vgscan --ignorelockingfailure 5.171 -vgchange -ay --ignorelockingfailure 5.172 -busybox mount /dev/mapper/$root /mnt 5.173 -try /dev/mapper $1 5.174 + 5.175 +lvm() { 5.176 + use lvmroot || return 5.177 + mod dm-mod 5.178 + vgscan --ignorelockingfailure 5.179 + vgchange -ay --ignorelockingfailure 5.180 + busybox mount /dev/mapper/$root /mnt 5.181 + try /dev/mapper $1 5.182 } 5.183 5.184 -ldraid() 5.185 -{ 5.186 -while read l; do 5.187 - case "$l" in 5.188 - *raid10*) mod raid10;; 5.189 - *raid0*) mod raid0;; 5.190 - *raid1*) mod raid1;; 5.191 - *raid*) mod raid456;; 5.192 - *mirror*) mod dm-mirror;; 5.193 - esac 5.194 -done 5.195 + 5.196 +ldraid() { 5.197 + while read l; do 5.198 + case "$l" in 5.199 + *raid10*) mod raid10;; 5.200 + *raid0*) mod raid0;; 5.201 + *raid1*) mod raid1;; 5.202 + *raid*) mod raid456;; 5.203 + *mirror*) mod dm-mirror;; 5.204 + esac 5.205 + done 5.206 } 5.207 5.208 -if [ "$1" != "log" ]; then 5.209 + 5.210 + 5.211 + 5.212 +if [ "$1" != 'log' ]; then 5.213 busybox mount -t proc proc /proc 5.214 busybox mount -t sysfs sys /sys 5.215 busybox mount -t tmpfs tmpfs /run 5.216 @@ -175,6 +178,7 @@ 5.217 . /run/init 5.218 sh 5.219 fi 5.220 + 5.221 for i in /sys/block/*/dev /sys/block/*/*/dev ; do 5.222 [ -s "$i" ] || continue 5.223 n=${i%/dev} 5.224 @@ -183,9 +187,12 @@ 5.225 echo "Create $n " 5.226 mknod $n b $(sed 's/:/ /' < $i) 5.227 done 5.228 + 5.229 got modprobe && mod ${root//,/ } 5.230 + 5.231 [ -d /proc/sys/dev/cdrom ] && 5.232 ln -s $(sed '/name/!d;s/.*:[^a-z]*//' /proc/sys/dev/cdrom/info) /dev/cdrom 5.233 + 5.234 if use dmraid; then 5.235 dmraid -s | sed '/^type/!ds/.*: *//' | ldraid 5.236 [ ${root:0:4} = /dev ] || 5.237 @@ -209,6 +216,7 @@ 5.238 lvm /etc/mdadm.conf 5.239 fi 5.240 lvm 5.241 + 5.242 if got mount; then 5.243 dev=$root 5.244 x=$(busybox blkid|grep $dev|sed 's/:.*//;q') 5.245 @@ -219,6 +227,7 @@ 5.246 arg posixovl && echo "And posixovl..." && 5.247 mount.posixovl -F /mnt -- -oallow_other -odefault_permissions -osuid 5.248 fi 5.249 + 5.250 got loopfs && echo "Into file $root..." && 5.251 losetup /dev/loop0 /mnt/$root && busybox mount /dev/loop0 /mnt 5.252 got bindfs && echo "Bind ${root/,/ to }..." && 5.253 @@ -242,17 +251,17 @@ 5.254 got rootfssize 5.255 [ $(busybox free|busybox awk '/Mem:/{print int(($4*100)/$3)}') -ge $r ] && 5.256 busybox mount -t tmpfs -o size=$root,nr_inodes=$inodes tmpfs /mnt && 5.257 -for i in $(ls -ar /); do 5.258 - case "$i" in 5.259 - .*|cdrom) ;; 5.260 - mnt|proc|sys) mkdir /mnt/$i;; 5.261 - usr|var|rootfs*) mv /$i /mnt;; 5.262 - *) cp -a /$i /mnt 2>/dev/null && continue 5.263 - fail 5.264 - busybox umount /mnt 5.265 - exit 5.266 - esac 5.267 -done || fail 3mSkipped 5.268 + for i in $(ls -ar /); do 5.269 + case "$i" in 5.270 + .*|cdrom) ;; 5.271 + mnt|proc|sys) mkdir /mnt/$i;; 5.272 + usr|var|rootfs*) mv /$i /mnt;; 5.273 + *) cp -a /$i /mnt 2>/dev/null && continue 5.274 + fail 5.275 + busybox umount /mnt 5.276 + exit 5.277 + esac 5.278 + done || fail 3mSkipped 5.279 quit 5.280 mod squashfs 2>/dev/null || exit 5.281 msg aufs