diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | setup-alpine | 24 | ||||
| -rw-r--r-- | setup-keymap | 8 |
3 files changed, 18 insertions, 16 deletions
@@ -1,4 +1,4 @@ -V=2.0_alpha4 +V=2.0_alpha5 P=alpine-conf PV=$(P)-$(V) APKF=$(PV).apk diff --git a/setup-alpine b/setup-alpine index 95f7a1f..8af4ac2 100644 --- a/setup-alpine +++ b/setup-alpine @@ -33,18 +33,20 @@ grep '^iface.*dhcp' $ROOT/etc/network/interfaces > /dev/null ||\ # set root password [ -z "$NOCOMMIT" ] && while ! passwd ; do echo "Please retry." ; done +for i in devfs dmesg; do + rc-update add $i sysinit +done + # add some boot services -rc_add -s 01 hwclock -rc_add -s 04 modutils -rc_add -s 06 procps -rc_add -s 08 hostname +for i in hwclock modules sysctl hostname keymap syslog bootmisc; do + rc-update add $i boot +done -rc_add -s 20 keymap -rc_add -s 20 -k syslog -rc_add -s 22 bootmisc.sh -rc_add -s 24 -k networking +for i in networking; do + rc-update add $i default +done # start up the services -for i in hwclock modutils procps hostname syslog bootmisc.sh networking ; do - /etc/init.d/$i start -done +rc sysinit +rc boot +rc default diff --git a/setup-keymap b/setup-keymap index 37654e2..5f53dc1 100644 --- a/setup-keymap +++ b/setup-keymap @@ -5,8 +5,8 @@ PREFIX= MAPDIR="$ROOT/usr/share/bkeymaps" -if [ -f "$ROOT/etc/conf.d/keymap" ]; then - . "$ROOT/etc/conf.d/keymap" +if [ -f "$ROOT/etc/conf.d/keymaps" ]; then + . "$ROOT/etc/conf.d/keymaps" variant=$(basename $KEYMAP .bmap.gz) fi @@ -37,7 +37,7 @@ select_layout() { setup_mapfile() { local name=$(basename $1) - local conf="$ROOT/etc/conf.d/keymap" + local conf="$ROOT/etc/conf.d/keymaps" mkdir -p "$ROOT/etc/keymap" mkdir -p "$ROOT/etc/conf.d/" if gzip -9 -c "$1" > "$ROOT/etc/keymap/$name.gz" ; then @@ -45,7 +45,7 @@ setup_mapfile() { echo "KEYMAP=/etc/keymap/$name.gz" >> "$conf" # we actually load the keymap now zcat /etc/keymap/$name.gz | loadkmap - rc_add -s 20 keymap + rc-update add keymaps boot goodbye 0 fi } |