Changeset 621ecb5 in freewrt for package

Timestamp:

Jul 22, 2006, 6:45:35 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

d30e6bd

Parents:

abca342

Message:

make add_rcconf actually useful (changes API)

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@368 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package

Files:

• base-files/default/etc/functions.sh (modified) (2 diffs)
• dnsmasq/ipkg/dnsmasq.postinst (modified) (1 diff)
• dropbear/ipkg/dropbear.postinst (modified) (1 diff)
• iptables/ipkg/iptables.postinst (modified) (1 diff)
• openssh/ipkg/openssh-server.postinst (modified) (1 diff)

package/base-files/default/etc/functions.sh

@@ -103 +103 @@
 
 rcconf_exists() {
-        grep -q "$1" $IPKG_INSTROOT/etc/rc.conf 2>&-
+        grep -q "^#*$1=" $IPKG_INSTROOT/etc/rc.conf 2>&-
         return $?
 }
@@ -130 +130 @@
 
 add_rcconf() {
-        rcconf_exists $1 $2 || {
+        rcconf_exists $2 || {
                 echo "adding service $1 to /etc/rc.conf"
-                echo "$2" >>$IPKG_INSTROOT/etc/rc.conf
+                printf '%s\t\t# %s\n' "$2=$3" "$1" >>$IPKG_INSTROOT/etc/rc.conf
         }
 }

package/dnsmasq/ipkg/dnsmasq.postinst

@@ -5 +5 @@
 add_user dnsmasq $(get_next_uid) $gid /tmp
 add_group dnsmasq $gid
-add_rcconf dnsmasq "dns_dhcp=YES"
+add_rcconf dnsmasq dns_dhcp YES

package/dropbear/ipkg/dropbear.postinst

@@ -1 +1 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf dropbear "ssh=YES"
+add_rcconf dropbear ssh YES

package/iptables/ipkg/iptables.postinst

@@ -1 +1 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf iptables "firewall=NO"
+add_rcconf iptables firewall NO

package/openssh/ipkg/openssh-server.postinst

@@ -3 +3 @@
 add_user sshd $(get_next_uid) $(get_next_gid) /var/run/sshd
 add_group sshd $(get_next_gid)
-add_rcconf sshd "sshd=NO"
+add_rcconf openssh sshd NO