Browse Source

allow DAEMON mode to be used when m selected

Waldemar Brodkorb 8 years ago
parent
commit
11e0c7f2e6
3 changed files with 9 additions and 4 deletions
  1. 1 1
      adk/tools/pkgmaker.c
  2. 7 2
      scripts/update-rcconf
  3. 1 1
      target/appliances/kodi.appliance

+ 1 - 1
adk/tools/pkgmaker.c

@@ -474,7 +474,7 @@ int main() {
 									else
 										fprintf(icfg, "config ADK_RUNTIME_START_%s\n", toupperstr(sname));
 									fprintf(icfg, "\tprompt \"Start %s on boot\"\n", sname2);
-									fprintf(icfg, "\tboolean\n");
+									fprintf(icfg, "\ttristate\n");
 									if (strncmp("busybox", sname, 7) == 0)
 										fprintf(icfg, "\tdepends on BUSYBOX_%s\n", toupperstr(sname2));
 									else

+ 7 - 2
scripts/update-rcconf

@@ -24,7 +24,8 @@ fi
 
 for service in $(grep ^ADK_RUNTIME_START_ $topdir/.config |grep -v ADK_RUNTIME_START_SERVICES);do
 	rcname=$(echo $service|sed -e "s#ADK_RUNTIME_START_##")
-	rcname=$(echo $rcname| sed -e "s#=y##")
+	mode=$(echo $rcname|cut -d \= -f 2)
+	rcname=$(echo $rcname| sed -e "s#=.*##")
 	rcname=$(echo $rcname| sed -e "s#^BUSYBOX_##")
 	rcname=$(echo $rcname| tr '[:upper:]' '[:lower:]')
 	# workarounds where package name not equal to service name
@@ -37,5 +38,9 @@ for service in $(grep ^ADK_RUNTIME_START_ $topdir/.config |grep -v ADK_RUNTIME_S
 	if [ $rcname = "openssh_server" ];then
 		rcname=openssh
 	fi
-	sed -i -e "s#$rcname=\"NO\"#$rcname=\"YES\"#" $rcconf
+	if [ $mode = "m" ]; then
+	  sed -i -e "s#$rcname=\"NO\"#$rcname=\"DAEMON\"#" $rcconf
+	else
+	  sed -i -e "s#$rcname=\"NO\"#$rcname=\"YES\"#" $rcconf
+	fi
 done

+ 1 - 1
target/appliances/kodi.appliance

@@ -20,7 +20,7 @@ config ADK_APPLIANCE_KODI
 	select ADK_RUNTIME_START_BUSYBOX_NTPD
 	select ADK_RUNTIME_START_BUSYBOX_SYSLOGD
 	select ADK_RUNTIME_START_BUSYBOX_WATCHDOG
-	select ADK_RUNTIME_START_KODI
+	select ADK_RUNTIME_START_KODI m
 	select ADK_KERNEL_INPUT_EVDEV m
 	select ADK_KERNEL_USB_HID m
 	select ADK_TARGET_USB_KEYBOARD