slitaz-arm rev 112
Mini fixes to cgi-adm, rcS
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sat Apr 19 23:05:58 2014 +0200 (2014-04-19) |
parents | 97ec3b4f032d |
children | ca38563ed48f |
files | cgi-adm/plugins/status/status.cgi rootfs/etc/init.d/post-install.sh rootfs/etc/init.d/rcS rpi/cgi-adm/plugins/rpi_gpio/rpi_gpio.cgi |
line diff
1.1 --- a/cgi-adm/plugins/status/status.cgi Sat Apr 19 06:23:40 2014 +0000 1.2 +++ b/cgi-adm/plugins/status/status.cgi Sat Apr 19 23:05:58 2014 +0200 1.3 @@ -6,7 +6,7 @@ 1.4 if [ "$(GET status)" ]; then 1.5 html_header "Status" 1.6 cat << EOT 1.7 -<h1>System Status</h1> 1.8 +<h1>System status</h1> 1.9 <p> 1.10 Uptime: $(uptime) 1.11 </p>
2.1 --- a/rootfs/etc/init.d/post-install.sh Sat Apr 19 06:23:40 2014 +0000 2.2 +++ b/rootfs/etc/init.d/post-install.sh Sat Apr 19 23:05:58 2014 +0200 2.3 @@ -20,10 +20,12 @@ 2.4 2.5 slitaz-config root_passwd 2.6 slitaz-config add_user 2.7 +#dialog --yesno "$user account was created. Do you want X autologin ?" 2.8 #dialog --yesno "Do you wish to setup a network connection ?" 2.9 #slitaz-config network_connection 2.10 2.11 # No post install on next boot. 2.12 +mkdir -p /var/lib/slitaz 2.13 echo "$ARCH" > /var/lib/slitaz/post-install 2.14 2.15 # Run packages post_install since when we generate a distro from
3.1 --- a/rootfs/etc/init.d/rcS Sat Apr 19 06:23:40 2014 +0000 3.2 +++ b/rootfs/etc/init.d/rcS Sat Apr 19 23:05:58 2014 +0200 3.3 @@ -49,6 +49,11 @@ 3.4 mdev -s; status 3.5 fi 3.6 3.7 +# Run post install configs on first boot 3.8 +if [ ! -f "/var/lib/slitaz/post-install" ]; then 3.9 + /etc/init.d/post-install.sh 3.10 +fi 3.11 + 3.12 # Clean up /tmp 3.13 echo -n "Cleaning up temporary files: /tmp" 3.14 rm -rf /tmp && mkdir /tmp && chmod 1777 /tmp 3.15 @@ -59,11 +64,6 @@ 3.16 syslogd -s ${SYSLOGD_SIZE} && klogd 3.17 status 3.18 3.19 -# Run post install configs on first boot 3.20 -if [ ! -f "/var/lib/slitaz/post-install" ]; then 3.21 - /etc/init.d/post-install.sh 3.22 -fi 3.23 - 3.24 # Load all modules from config file 3.25 if [ "$LOAD_MODULES" ]; then 3.26 colorize 33 "Loading Kernel modules..."
4.1 --- a/rpi/cgi-adm/plugins/rpi_gpio/rpi_gpio.cgi Sat Apr 19 06:23:40 2014 +0000 4.2 +++ b/rpi/cgi-adm/plugins/rpi_gpio/rpi_gpio.cgi Sat Apr 19 23:05:58 2014 +0200 4.3 @@ -19,7 +19,7 @@ 4.4 4.5 <h2>$sysfs</h2> 4.6 <pre> 4.7 -$(ls $sysfs) 4.8 +$(ls -1p $sysfs) 4.9 </pre> 4.10 4.11 <h2>Export example</h2>