Make rmrecovery permanent active per default.

diff --git a/packages/openslug-init/openslug-init-0.10/turnup b/packages/openslug-init/openslug-init-0.10/turnup
index 14756fc..86c573a 100644 (file)
--- a/packages/openslug-init/openslug-init-0.10/turnup
+++ b/packages/openslug-init/openslug-init-0.10/turnup
@@ -194,20 +194,6 @@ setup_var() {
        return 0
 }
 
-#
-# setup_files new
-#  At present just puts the rmrecovery links in.
-setup_files() {
-       test -n "$1" -a -d "$1"/etc || {
-               echo "turnup: setup_files($1): expected a directory" >&2
-               return 1
-       }
-       #
-       # add the script to remove .recovery
-       update-rc.d -r "$1" rmrecovery start 99 1 2 3 4 5 .
-       return 0
-}
-
 #
 # setup_syslog new
 #  Moves the syslog to a file - appropriate for disk and nfs types, not
@@ -258,14 +244,11 @@ setup_rootfs() {
        flash)  return 0;;
        disk)   setup_dev "$new" "$table" &&
                setup_var "$new" disk &&
-               setup_files "$new" &&
                setup_syslog "$new";;
        memstick)
-               setup_bootdev "$new" "$table" &&
-               setup_files "$new";;
+               setup_bootdev "$new" "$table" ;;
        nfs)    setup_dev "$new" "$table" &&
                setup_var "$new" nfs &&
-               setup_files "$new" &&
                setup_syslog "$new";;
        *)      echo "turnup: setup_rootfs: $type: unknown rootfs type" >&2
                return 1;;

diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index f0af1aa..c9af6e2 100644 (file)
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -121,6 +121,7 @@ pkg_postinst_openslug-init() {
        update-rc.d $opt syslog.file            start 39 S . start 47 0 6 .
        update-rc.d $opt syslog.network         start 44 S . start 39 0 6 .
        update-rc.d $opt zleds                  start 99 S 1 2 3 4 5 . stop  5 0 1 2 3 4 5 6 .
+       update-rc.d $opt rmrecovery             start 99 1 2 3 4 5 .
        # bug fix for startup
        update-rc.d $opt leds_startup           start  1 1 2 3 4 5 .
 }