# HG changeset patch # User Christophe Lincoln # Date 1488880262 -3600 # Node ID ff5c597e5d111d514f7961b4ddb0b20bc68fb978 # Parent a4a124868212e9d0a642ea95b67716cad011118d Some fixes after booting frugal and testing diff -r a4a124868212 -r ff5c597e5d11 examples/initfs-scratch/etc/daemons/httpd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/initfs-scratch/etc/daemons/httpd Tue Mar 07 10:51:02 2017 +0100 @@ -0,0 +1,5 @@ +#!/bin/sh +desc="Busybox web server" +start() { + /usr/sbin/httpd -u 80:80 +} diff -r a4a124868212 -r ff5c597e5d11 initfs/etc/init.d/rcS --- a/initfs/etc/init.d/rcS Tue Mar 07 00:14:30 2017 +0100 +++ b/initfs/etc/init.d/rcS Tue Mar 07 10:51:02 2017 +0100 @@ -32,8 +32,11 @@ device=$(echo $val | cut -d ":" -f 1) path=$(echo $val | cut -d ":" -f 2) echo "device: $device path: $path" - if [ -f "$path" ]; then - mount -o loop -t ext3 ${path} /home + mountpoint=/media/$(basename $device) + mkdir ${mountpoint} + mount ${device} ${mountpoint} + if [ -f "${mountpoint}$path" ]; then + mount -o loop -t ext3 ${mountpoint}${path} /home else colorize 031 "Can't find sebhome.img virtual disk image" fi ;; diff -r a4a124868212 -r ff5c597e5d11 seb --- a/seb Tue Mar 07 00:14:30 2017 +0100 +++ b/seb Tue Mar 07 10:51:02 2017 +0100 @@ -166,6 +166,7 @@ networks: files EOT check + mkdir -p ${rootfs}/etc/daemons } build() { diff -r a4a124868212 -r ff5c597e5d11 tools/sebos --- a/tools/sebos Tue Mar 07 00:14:30 2017 +0100 +++ b/tools/sebos Tue Mar 07 10:51:02 2017 +0100 @@ -171,7 +171,7 @@ -d|daemon*) # Handle daemons - daemons="daemons" + daemons="/etc/daemons" if [ ! "$2" ]; then title "Installed daemons" for d in $(ls $daemons); do