From da15bf2da11187bb1d1d61bda1ba960ed5a2e5bb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 21 Oct 2009 14:08:44 +0200 Subject: [PATCH] OpenRC: fix conf_files, fix init.d/network. Bump revision. --HG-- extra : convert_revision : 6b8fa409972542debc65ad251d75b5b793cbeaa1 --- .../fix_incorrect_shell_syntax_init.d_network.diff | 11 +++++++++++ templates/OpenRC/template | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 templates/OpenRC/patches/fix_incorrect_shell_syntax_init.d_network.diff diff --git a/templates/OpenRC/patches/fix_incorrect_shell_syntax_init.d_network.diff b/templates/OpenRC/patches/fix_incorrect_shell_syntax_init.d_network.diff new file mode 100644 index 0000000000..331ad943d4 --- /dev/null +++ b/templates/OpenRC/patches/fix_incorrect_shell_syntax_init.d_network.diff @@ -0,0 +1,11 @@ +--- init.d/network.in.orig 2009-10-21 13:58:01.000000000 +0200 ++++ init.d/network.in 2009-10-21 13:58:24.000000000 +0200 +@@ -174,7 +174,7 @@ start() + { + local cr=0 r= int= intv= cmd= args= upcmd= + +- if [ -z "$domainname" && -s /etc/defaultdomain ]; then ++ if [ -z "$domainname" -a -s /etc/defaultdomain ]; then + domainname=$(cat /etc/defaultdomain) + fi + if [ -n "$domainname" ]; then diff --git a/templates/OpenRC/template b/templates/OpenRC/template index b41c176a23..b6d8e54e93 100644 --- a/templates/OpenRC/template +++ b/templates/OpenRC/template @@ -1,6 +1,7 @@ # Template file for 'OpenRC' pkgname=OpenRC version=0.5.2 +revision=1 wrksrc=openrc-${version} distfiles="http://roy.marples.name/downloads/openrc/openrc-$version.tar.bz2" build_style=gnu_makefile @@ -20,7 +21,7 @@ conf_files="/etc/rc.conf /etc/conf.d/bootmisc /etc/conf.d/consolefont /etc/conf.d/dmesg /etc/conf.d/fsck /etc/conf.d/hostname /etc/conf.d/hwclock /etc/conf.d/keymaps /etc/conf.d/local /etc/conf.d/locale /etc/conf.d/localmount /etc/conf.d/modules /etc/conf.d/network - /etc/conf.d/urandom /etc/conf.d/staticroutes /etc/inittab" + /etc/conf.d/urandom /etc/conf.d/staticroute /etc/inittab" Add_dependency full glibc Add_dependency full psmisc