From 7eecf979560f5fbd06f940677f99a5cd743e8347 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 6 Feb 2015 14:00:25 +0000
Subject: [PATCH] - updated for 0.4.13
---
rc-scripts-misc.patch | 40 ++++-----
rc-scripts-net-bond.patch | 93 ++++++++-------------
rc-scripts-net-br.patch | 8 +-
rc-scripts-no_tmpfs_root_fsck.patch | 8 +-
rc-scripts-raid_lvm.patch | 14 ++--
rc-scripts-selinuxfs_mount.patch | 8 +-
rc-scripts-sh_fixes.patch | 28 +++----
rc-scripts-tld.patch | 123 +++++++++++++++++-----------
8 files changed, 163 insertions(+), 159 deletions(-)
diff --git a/rc-scripts-misc.patch b/rc-scripts-misc.patch
index cfa8ca2..53b0b99 100644
--- a/rc-scripts-misc.patch
+++ b/rc-scripts-misc.patch
@@ -1,7 +1,19 @@
-diff -ur rc-scripts-0.4.12.orig/lib/ifup-vlan rc-scripts-0.4.12/lib/ifup-vlan
---- rc-scripts-0.4.12.orig/lib/ifup-vlan 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifup-vlan 2014-07-22 15:59:17.659000000 +0000
-@@ -44,7 +44,7 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/functions rc-scripts-0.4.13/lib/functions
+--- rc-scripts-0.4.13.orig/lib/functions 2015-02-06 13:41:29.000000000 +0000
++++ rc-scripts-0.4.13/lib/functions 2015-02-06 13:53:57.590314244 +0000
+@@ -579,7 +579,7 @@ run_cmd() {
+ cd /
+ export HOME=/tmp TMPDIR=/tmp
+ if is_no "$RC_LOGGING"; then
+- ${user:+setuidgid -s $user} "$@" 2>&1
++ ${user:+setuidgid -s $user} eval "$@" 2>&1
+ else
+ ${user:+setuidgid -s $user} initlog -c "$*" 2>&1
+ fi
+diff -urNp rc-scripts-0.4.13.orig/lib/ifup-vlan rc-scripts-0.4.13/lib/ifup-vlan
+--- rc-scripts-0.4.13.orig/lib/ifup-vlan 2015-01-22 16:01:18.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifup-vlan 2015-02-06 13:53:57.585314244 +0000
+@@ -46,7 +46,7 @@ if [ ! -f /etc/sysconfig/interfaces/ifcf
exit 1
fi
@@ -10,10 +22,10 @@ diff -ur rc-scripts-0.4.12.orig/lib/ifup-vlan rc-scripts-0.4.12/lib/ifup-vlan
nls "Warning: ${VLAN_DEV} is disabled on boot."
fi
-diff -ur rc-scripts-0.4.12.orig/rc.d/init.d/network rc-scripts-0.4.12/rc.d/init.d/network
---- rc-scripts-0.4.12.orig/rc.d/init.d/network 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/rc.d/init.d/network 2014-07-22 15:59:32.967000000 +0000
-@@ -130,7 +130,7 @@
+diff -urNp rc-scripts-0.4.13.orig/rc.d/init.d/network rc-scripts-0.4.13/rc.d/init.d/network
+--- rc-scripts-0.4.13.orig/rc.d/init.d/network 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/init.d/network 2015-02-06 13:53:57.589314244 +0000
+@@ -130,7 +130,7 @@ network_interface_configs() {
find_boot_interfaces() {
ifcfg_files="$(network_interface_configs 'ifcfg-*')"
@@ -22,15 +34,3 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/init.d/network rc-scripts-0.4.12/rc.d/init.
if [ -n "$bootprio" ]; then
# find all the interfaces besides loopback.
-diff -ur rc-scripts-0.4.12.orig/lib/functions rc-scripts-0.4.12/lib/functions
---- rc-scripts-0.4.12.orig/lib/functions 2014-06-19 19:51:23.000000000 +0000
-+++ rc-scripts-0.4.12/lib/functions 2014-07-25 16:11:36.742000000 +0000
-@@ -590,7 +590,7 @@
- cd /
- export HOME=/tmp TMPDIR=/tmp
- if is_no "$RC_LOGGING"; then
-- ${user:+setuidgid -s $user} "$@" 2>&1
-+ ${user:+setuidgid -s $user} eval "$@" 2>&1
- else
- ${user:+setuidgid -s $user} initlog -c "$*" 2>&1
- fi
diff --git a/rc-scripts-net-bond.patch b/rc-scripts-net-bond.patch
index 22b7047..3d401ee 100644
--- a/rc-scripts-net-bond.patch
+++ b/rc-scripts-net-bond.patch
@@ -1,35 +1,21 @@
-diff -urN rc-scripts-0.4.12.orig/lib/ifdown rc-scripts-0.4.12/lib/ifdown
---- rc-scripts-0.4.12.orig/lib/ifdown 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifdown 2014-07-12 18:44:23.637000000 +0000
-@@ -118,25 +118,6 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/ifdown rc-scripts-0.4.13/lib/ifdown
+--- rc-scripts-0.4.13.orig/lib/ifdown 2015-01-22 16:01:18.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifdown 2015-02-06 13:44:37.910314244 +0000
+@@ -118,11 +118,6 @@ if [ -n "${SUBDEVICE}" ]; then
ip addr del ${IP4ADDR} label ${SUBDEVICE} dev ${DEVICE}
else
LC_ALL=C ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
-
-- if [ ${DEVICETYPE} = "bond" ]; then
-- if [ ! -x /sbin/ifenslave ]; then
-- nls "%s is missing. Can't continue." "/sbin/ifenslave"
-- exit 1
-- fi
--
-- # get up the bonding device before enslaving
-- if ! check_device_down "${DEVICE}"; then
-- ip link set ${DEVICE} up
-- fi
--
-- for BSVAR in $(awk '/Slave Interface:/{ print $3}' /proc/net/bonding/${DEVICE}); do
-- if [ "${BSVAR}" ]; then
-- ifenslave -d ${DEVICE} $BSVAR
-- fi
-- done
-- fi
+- if is_yes "$SLAVE"; then
+- ip link set ${DEVICE} nomaster
+- fi
-
ip link set ${DEVICE} down
fi
-diff -urN rc-scripts-0.4.12.orig/lib/ifdown-bond rc-scripts-0.4.12/lib/ifdown-bond
---- rc-scripts-0.4.12.orig/lib/ifdown-bond 1970-01-01 00:00:00.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifdown-bond 2014-07-12 22:00:34.509000000 +0000
+diff -urNp rc-scripts-0.4.13.orig/lib/ifdown-bond rc-scripts-0.4.13/lib/ifdown-bond
+--- rc-scripts-0.4.13.orig/lib/ifdown-bond 1970-01-01 00:00:00.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifdown-bond 2015-02-06 13:42:15.348314244 +0000
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
@@ -85,37 +71,30 @@ diff -urN rc-scripts-0.4.12.orig/lib/ifdown-bond rc-scripts-0.4.12/lib/ifdown-bo
+ exit 1
+ fi
+fi
-diff -urN rc-scripts-0.4.12.orig/lib/ifup rc-scripts-0.4.12/lib/ifup
---- rc-scripts-0.4.12.orig/lib/ifup 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifup 2014-07-12 21:58:42.147000000 +0000
-@@ -89,18 +89,12 @@
- exit 1
+diff -urNp rc-scripts-0.4.13.orig/lib/ifup rc-scripts-0.4.13/lib/ifup
+--- rc-scripts-0.4.13.orig/lib/ifup 2015-01-22 16:01:18.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifup 2015-02-06 13:51:40.208314244 +0000
+@@ -120,11 +120,12 @@ if [ -n "$ETHTOOL_OPTS" ] ; then
fi
--if is_yes "$SLAVE" && [ ! -x /sbin/ifenslave ]; then
-- nls "%s is missing. Can't continue." "/sbin/ifenslave"
-- exit 1
--fi
--
--if is_yes "$SLAVE" && [ -n "$MASTER" -a -x /sbin/ifenslave ]; then
-- RFLAG="" && is_yes "${RECIEVE-ONLY}" && RFLAG="-r"
+ if is_yes "$SLAVE" && [ -n "$MASTER" ] ; then
+- nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
+- ip link set "$DEVICE" master "$MASTER"
+- ip link set "$DEVICE" up
-
-- ip link set ${DEVICE} down
-- nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
-- ifenslave $RFLAG "$MASTER" "$DEVICE"
--
-+if is_yes "$SLAVE" && [ -n "$MASTER" ]; then
+- exit 0
+ if ! grep -wq "${DEVICE}" /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null; then
+ nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
+ ip link set dev ${DEVICE} down
+ echo "+${DEVICE}" > /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null
+ fi
- if [ -n "$ETHTOOL_OPTS" ] ; then
- /sbin/ethtool -s $DEVICE $ETHTOOL_OPTS
- fi
-diff -urN rc-scripts-0.4.12.orig/lib/ifup-bond rc-scripts-0.4.12/lib/ifup-bond
---- rc-scripts-0.4.12.orig/lib/ifup-bond 1970-01-01 00:00:00.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifup-bond 2014-07-12 22:08:02.953000000 +0000
++ exit 0
+ fi
+
+ if [ "$HANDLING" = "2" ]; then
+diff -urNp rc-scripts-0.4.13.orig/lib/ifup-bond rc-scripts-0.4.13/lib/ifup-bond
+--- rc-scripts-0.4.13.orig/lib/ifup-bond 1970-01-01 00:00:00.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifup-bond 2015-02-06 13:42:15.349314244 +0000
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
@@ -192,10 +171,10 @@ diff -urN rc-scripts-0.4.12.orig/lib/ifup-bond rc-scripts-0.4.12/lib/ifup-bond
+ echo $value > /sys/class/net/${DEVICE}/bonding/$key
+ fi
+done
-diff -urN rc-scripts-0.4.12.orig/lib/Makefile.am rc-scripts-0.4.12/lib/Makefile.am
---- rc-scripts-0.4.12.orig/lib/Makefile.am 2013-11-02 20:50:20.000000000 +0000
-+++ rc-scripts-0.4.12/lib/Makefile.am 2014-07-12 22:01:57.571000000 +0000
-@@ -10,6 +10,7 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/Makefile.am rc-scripts-0.4.13/lib/Makefile.am
+--- rc-scripts-0.4.13.orig/lib/Makefile.am 2013-11-02 20:50:20.000000000 +0000
++++ rc-scripts-0.4.13/lib/Makefile.am 2015-02-06 13:42:15.349314244 +0000
+@@ -10,6 +10,7 @@ sbin_SCRIPTS = \
scriptsdir = @exec_prefix@/lib/$(PACKAGE)
scripts_SCRIPTS = \
@@ -203,7 +182,7 @@ diff -urN rc-scripts-0.4.12.orig/lib/Makefile.am rc-scripts-0.4.12/lib/Makefile.
ifdown-br \
ifdown-irda \
ifdown-ppp \
-@@ -17,6 +18,7 @@
+@@ -17,6 +18,7 @@ scripts_SCRIPTS = \
ifdown-sl \
ifdown-vlan \
ifup-aliases \
@@ -211,10 +190,10 @@ diff -urN rc-scripts-0.4.12.orig/lib/Makefile.am rc-scripts-0.4.12/lib/Makefile.
ifup-br \
ifup-ipx \
ifup-irda \
-diff -urN rc-scripts-0.4.12.orig/lib/Makefile.in rc-scripts-0.4.12/lib/Makefile.in
---- rc-scripts-0.4.12.orig/lib/Makefile.in 2014-07-12 11:45:17.000000000 +0000
-+++ rc-scripts-0.4.12/lib/Makefile.in 2014-07-12 22:01:50.605000000 +0000
-@@ -256,6 +256,7 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/Makefile.in rc-scripts-0.4.13/lib/Makefile.in
+--- rc-scripts-0.4.13.orig/lib/Makefile.in 2015-01-22 16:02:57.000000000 +0000
++++ rc-scripts-0.4.13/lib/Makefile.in 2015-02-06 13:42:15.350314244 +0000
+@@ -256,6 +256,7 @@ sbin_SCRIPTS = \
#scriptsdir = @networkscriptsdir@
scriptsdir = @exec_prefix@/lib/$(PACKAGE)
scripts_SCRIPTS = \
@@ -222,7 +201,7 @@ diff -urN rc-scripts-0.4.12.orig/lib/Makefile.in rc-scripts-0.4.12/lib/Makefile.
ifdown-br \
ifdown-irda \
ifdown-ppp \
-@@ -263,6 +264,7 @@
+@@ -263,6 +264,7 @@ scripts_SCRIPTS = \
ifdown-sl \
ifdown-vlan \
ifup-aliases \
diff --git a/rc-scripts-net-br.patch b/rc-scripts-net-br.patch
index d55d5e7..0911962 100644
--- a/rc-scripts-net-br.patch
+++ b/rc-scripts-net-br.patch
@@ -1,7 +1,7 @@
-diff -ur rc-scripts-0.4.12.orig/lib/ifup-br rc-scripts-0.4.12.fix/lib/ifup-br
---- rc-scripts-0.4.12.orig/lib/ifup-br 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12.fix/lib/ifup-br 2014-07-18 15:33:28.455000000 +0000
-@@ -65,20 +65,19 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/ifup-br rc-scripts-0.4.13/lib/ifup-br
+--- rc-scripts-0.4.13.orig/lib/ifup-br 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifup-br 2015-02-06 13:52:57.065314244 +0000
+@@ -65,20 +65,19 @@ done
# standard
diff --git a/rc-scripts-no_tmpfs_root_fsck.patch b/rc-scripts-no_tmpfs_root_fsck.patch
index dd294d0..7852b0f 100644
--- a/rc-scripts-no_tmpfs_root_fsck.patch
+++ b/rc-scripts-no_tmpfs_root_fsck.patch
@@ -1,7 +1,7 @@
-diff -ur rc-scripts-0.4.9.orig/rc.d/rc.sysinit rc-scripts-0.4.9/rc.d/rc.sysinit
---- rc-scripts-0.4.9.orig/rc.d/rc.sysinit 2013-11-11 10:58:44.000000000 +0000
-+++ rc-scripts-0.4.9/rc.d/rc.sysinit 2013-11-23 14:01:46.596625480 +0000
-@@ -550,7 +550,7 @@
+diff -urNp rc-scripts-0.4.13.orig/rc.d/rc.sysinit rc-scripts-0.4.13/rc.d/rc.sysinit
+--- rc-scripts-0.4.13.orig/rc.d/rc.sysinit 2015-02-06 13:30:49.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/rc.sysinit 2015-02-06 13:39:53.458314244 +0000
+@@ -602,7 +602,7 @@ if ! is_yes "$VSERVER" && [[ "$container
_ROOTFS_DEVICE=$(awk '($1 !~ /^#/ && $2 == "/" && NF >= 6) { print $1}' /etc/fstab)
_ROOTFS_TYPE=$(awk '$2 == "/" && $3 != "rootfs" { print $3 }' /proc/mounts 2>/dev/null)
diff --git a/rc-scripts-raid_lvm.patch b/rc-scripts-raid_lvm.patch
index f8691c0..8173a1b 100644
--- a/rc-scripts-raid_lvm.patch
+++ b/rc-scripts-raid_lvm.patch
@@ -1,7 +1,7 @@
-diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysinit
---- rc-scripts-0.4.12.orig/rc.d/rc.sysinit 2014-08-05 14:20:11.411000000 +0000
-+++ rc-scripts-0.4.12/rc.d/rc.sysinit 2014-08-05 15:22:35.445000000 +0000
-@@ -301,63 +301,26 @@
+diff -urNp rc-scripts-0.4.13.orig/rc.d/rc.sysinit rc-scripts-0.4.13/rc.d/rc.sysinit
+--- rc-scripts-0.4.13.orig/rc.d/rc.sysinit 2015-02-06 13:41:29.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/rc.sysinit 2015-02-06 13:53:26.288314244 +0000
+@@ -301,63 +301,26 @@ check_root_fs() {
fi
}
@@ -73,7 +73,7 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini
}
# Init LVM
-@@ -390,8 +353,10 @@
+@@ -390,8 +353,10 @@ init_lvm() {
run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelocking
run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmsysinit
@@ -85,7 +85,7 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini
# display VG statistics
/sbin/vgdisplay -s $lvmignorelocking
fi
-@@ -830,7 +795,10 @@
+@@ -830,7 +795,10 @@ if ! is_yes "$VSERVER" && [[ "$container
fi
fi
@@ -97,7 +97,7 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini
if ! is_no "$LVM2"; then
init_lvm
fi
-@@ -842,10 +810,6 @@
+@@ -842,10 +810,6 @@ if ! is_yes "$VSERVER" && [[ "$container
[ $delay_cryptsetup = 0 ] && ok || fail
fi
diff --git a/rc-scripts-selinuxfs_mount.patch b/rc-scripts-selinuxfs_mount.patch
index 0816334..f447db0 100644
--- a/rc-scripts-selinuxfs_mount.patch
+++ b/rc-scripts-selinuxfs_mount.patch
@@ -1,7 +1,7 @@
-diff -ur rc-scripts-0.4.9.orig/rc.d/rc.sysinit rc-scripts-0.4.9/rc.d/rc.sysinit
---- rc-scripts-0.4.9.orig/rc.d/rc.sysinit 2013-11-11 10:58:44.000000000 +0000
-+++ rc-scripts-0.4.9/rc.d/rc.sysinit 2014-02-03 13:11:14.805999630 +0000
-@@ -112,9 +112,7 @@
+diff -urNp rc-scripts-0.4.13.orig/rc.d/rc.sysinit rc-scripts-0.4.13/rc.d/rc.sysinit
+--- rc-scripts-0.4.13.orig/rc.d/rc.sysinit 2015-02-06 13:39:53.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/rc.sysinit 2015-02-06 13:40:47.644314244 +0000
+@@ -127,9 +127,7 @@ init_selinux() {
if ! grep -Fq selinuxfs /proc/filesystems; then
# no support in kernel, no chance
SELINUX=no
diff --git a/rc-scripts-sh_fixes.patch b/rc-scripts-sh_fixes.patch
index 7a1eddf..5b7ada0 100644
--- a/rc-scripts-sh_fixes.patch
+++ b/rc-scripts-sh_fixes.patch
@@ -1,7 +1,7 @@
-diff -ur rc-scripts-0.4.11.orig/lib/functions rc-scripts-0.4.11/lib/functions
---- rc-scripts-0.4.11.orig/lib/functions 2014-03-20 19:25:43.000000000 +0000
-+++ rc-scripts-0.4.11/lib/functions 2014-05-17 12:57:04.495000084 +0000
-@@ -61,17 +61,6 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/functions rc-scripts-0.4.13/lib/functions
+--- rc-scripts-0.4.13.orig/lib/functions 2015-02-06 13:30:49.000000000 +0000
++++ rc-scripts-0.4.13/lib/functions 2015-02-06 13:41:29.629314244 +0000
+@@ -61,17 +61,6 @@ env_upstart=$USE_UPSTART
[ -r /etc/sysconfig/system ] && . /etc/sysconfig/system
[ -r /etc/sysconfig/bootsplash ] && . /etc/sysconfig/bootsplash
@@ -19,7 +19,7 @@ diff -ur rc-scripts-0.4.11.orig/lib/functions rc-scripts-0.4.11/lib/functions
[ "$env_upstart" ] && USE_UPSTART=$env_upstart
if [ -z "$VSERVER" -o "$VSERVER" = "detect" ]; then
-@@ -472,7 +461,7 @@
+@@ -471,7 +460,7 @@ busy() {
}
ok() {
@@ -28,7 +28,7 @@ diff -ur rc-scripts-0.4.11.orig/lib/functions rc-scripts-0.4.11/lib/functions
}
started() {
-@@ -480,7 +469,7 @@
+@@ -479,7 +468,7 @@ started() {
}
fail() {
@@ -37,10 +37,10 @@ diff -ur rc-scripts-0.4.11.orig/lib/functions rc-scripts-0.4.11/lib/functions
return 1
}
-diff -ur rc-scripts-0.4.11.orig/rc.d/rc rc-scripts-0.4.11/rc.d/rc
---- rc-scripts-0.4.11.orig/rc.d/rc 2013-11-18 21:13:37.000000000 +0000
-+++ rc-scripts-0.4.11/rc.d/rc 2014-05-17 10:10:26.085999953 +0000
-@@ -147,14 +147,15 @@
+diff -urNp rc-scripts-0.4.13.orig/rc.d/rc rc-scripts-0.4.13/rc.d/rc
+--- rc-scripts-0.4.13.orig/rc.d/rc 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/rc 2015-02-06 13:41:29.630314244 +0000
+@@ -147,14 +147,15 @@ af7=$(termput op)
text="$(termput op)$(nls '%sResource Manager: %sEntering runlevel number' "$af2" "$af7")"
text_size="$(nls '%sResource Manager: %sEntering runlevel number' "" "")"
resp_size="$(nls 'DONE')"
@@ -64,10 +64,10 @@ diff -ur rc-scripts-0.4.11.orig/rc.d/rc rc-scripts-0.4.11/rc.d/rc
echo "${af6}[${af2} $runlevel ${af6}]${af7}"
# Is there an rc directory for this new runlevel?
-diff -ur rc-scripts-0.4.11.orig/rc.d/rc.sysinit rc-scripts-0.4.11/rc.d/rc.sysinit
---- rc-scripts-0.4.11.orig/rc.d/rc.sysinit 2014-03-02 10:02:29.000000000 +0000
-+++ rc-scripts-0.4.11/rc.d/rc.sysinit 2014-05-11 15:06:33.166000019 +0000
-@@ -927,7 +927,7 @@
+diff -urNp rc-scripts-0.4.13.orig/rc.d/rc.sysinit rc-scripts-0.4.13/rc.d/rc.sysinit
+--- rc-scripts-0.4.13.orig/rc.d/rc.sysinit 2015-02-06 13:40:47.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/rc.sysinit 2015-02-06 13:41:29.632314244 +0000
+@@ -966,7 +966,7 @@ if ! is_yes "$VSERVER" && [[ "$container
. /etc/rc.d/rc.serial
fi
diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch
index 56dbbf4..1f30c9e 100644
--- a/rc-scripts-tld.patch
+++ b/rc-scripts-tld.patch
@@ -1,7 +1,7 @@
-diff -ur rc-scripts-0.4.12.orig/doc/net-scripts.txt rc-scripts-0.4.12/doc/net-scripts.txt
---- rc-scripts-0.4.12.orig/doc/net-scripts.txt 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/doc/net-scripts.txt 2014-07-12 11:41:36.258000000 +0000
-@@ -145,11 +145,11 @@
+diff -urNp rc-scripts-0.4.13.orig/doc/net-scripts.txt rc-scripts-0.4.13/doc/net-scripts.txt
+--- rc-scripts-0.4.13.orig/doc/net-scripts.txt 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/doc/net-scripts.txt 2015-02-06 13:30:49.145314244 +0000
+@@ -145,11 +145,11 @@ Files in /etc/sysconfig/interfaces/
INITSCRIPT=<modem command>
string which initialises your modem. Usualy something like
AT&F0&C1&D2
@@ -15,7 +15,7 @@ diff -ur rc-scripts-0.4.12.orig/doc/net-scripts.txt rc-scripts-0.4.12/doc/net-sc
PEERDNS=yes|no
IPV6_PPP=yes|no
use IPv6 for ppp
-@@ -186,7 +186,7 @@
+@@ -186,7 +186,7 @@ Files in /etc/sysconfig/interfaces/
the connection. For SLIP devices, a DIP script is written
from the chat script; for PPP devices, the chat script is used
directly.
@@ -24,18 +24,31 @@ diff -ur rc-scripts-0.4.12.orig/doc/net-scripts.txt rc-scripts-0.4.12/doc/net-sc
(actually by grep in firstplace to get rid of comments) before it
is passed to chat.
This allows you to substitute shell variables with their values
-diff -ur rc-scripts-0.4.12.orig/doc/sysvinitfiles rc-scripts-0.4.12/doc/sysvinitfiles
---- rc-scripts-0.4.12.orig/doc/sysvinitfiles 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/doc/sysvinitfiles 2014-07-12 11:41:36.259000000 +0000
+diff -urNp rc-scripts-0.4.13.orig/doc/sysvinitfiles rc-scripts-0.4.13/doc/sysvinitfiles
+--- rc-scripts-0.4.13.orig/doc/sysvinitfiles 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/doc/sysvinitfiles 2015-02-06 13:30:49.145314244 +0000
@@ -1,4 +1,4 @@
-Writing System V init scripts for PLD Linux
+Writing System V init scripts for TLD Linux
===============================================
All System V init scripts are named /etc/rc.d/init.d/<servicename>
-diff -ur rc-scripts-0.4.12.orig/inittab rc-scripts-0.4.12/inittab
---- rc-scripts-0.4.12.orig/inittab 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/inittab 2014-07-12 11:41:36.259000000 +0000
+diff -urNp rc-scripts-0.4.13.orig/hwprofile rc-scripts-0.4.13/hwprofile
+--- rc-scripts-0.4.13.orig/hwprofile 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/hwprofile 2015-02-06 13:36:28.437314244 +0000
+@@ -42,9 +42,6 @@ no opts - show help
+ -f - find proper profile and run it
+ -l - list configured profiles
+ -q - be quiet (used only in few modes)
+-
+-Please send all bug reports to:
+-pld-rc-scripts@pld-linux.org.
+ '
+ }
+
+diff -urNp rc-scripts-0.4.13.orig/inittab rc-scripts-0.4.13/inittab
+--- rc-scripts-0.4.13.orig/inittab 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/inittab 2015-02-06 13:30:49.146314244 +0000
@@ -7,7 +7,7 @@
# Modified for RHS Linux by Marc Ewing and Donnie Barnes
#
@@ -45,9 +58,9 @@ diff -ur rc-scripts-0.4.12.orig/inittab rc-scripts-0.4.12/inittab
# 0 - halt (Do NOT set initdefault to this)
# 1 - Single user mode
# 2 - Multiuser, without NFS (The same as 3, if you do not have networking)
-diff -ur rc-scripts-0.4.12.orig/lib/functions rc-scripts-0.4.12/lib/functions
---- rc-scripts-0.4.12.orig/lib/functions 2014-06-19 19:51:23.000000000 +0000
-+++ rc-scripts-0.4.12/lib/functions 2014-07-12 11:41:36.260000000 +0000
+diff -urNp rc-scripts-0.4.13.orig/lib/functions rc-scripts-0.4.13/lib/functions
+--- rc-scripts-0.4.13.orig/lib/functions 2015-01-22 16:01:15.000000000 +0000
++++ rc-scripts-0.4.13/lib/functions 2015-02-06 13:30:49.147314244 +0000
@@ -5,7 +5,7 @@
#
# Author: Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
@@ -57,7 +70,7 @@ diff -ur rc-scripts-0.4.12.orig/lib/functions rc-scripts-0.4.12/lib/functions
# Marek Obuchowicz <elephant@pld-linux.org>
# Arkadiusz MiÅkiewicz <misiek@pld-linux.org>
# MichaÅ Kochanowicz <mkochano@pld-linux.org>
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ CDONE="$GREEN" # DONE and WORK color
CBUSY="$MAGENTA" # BUSY color
CFAIL="$RED" # FAIL and DIED color
CPOWEREDBY="$CYAN" # "Powered by" color
@@ -66,7 +79,7 @@ diff -ur rc-scripts-0.4.12.orig/lib/functions rc-scripts-0.4.12/lib/functions
CI="$RED" # Capital I color (press I to enter interactive startup)
CRESMAN="$GREEN" # "Resource Manager" color
CHARS="" # Characters displayed on the beginning of show line
-@@ -422,7 +422,7 @@
+@@ -422,7 +422,7 @@ msg_usage() {
nls "Usage: %s" "$*"
}
@@ -75,10 +88,10 @@ diff -ur rc-scripts-0.4.12.orig/lib/functions rc-scripts-0.4.12/lib/functions
show() {
local text len time
-diff -ur rc-scripts-0.4.12.orig/po/de.po rc-scripts-0.4.12/po/de.po
---- rc-scripts-0.4.12.orig/po/de.po 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/po/de.po 2014-07-12 11:41:36.260000000 +0000
-@@ -446,7 +446,7 @@
+diff -urNp rc-scripts-0.4.13.orig/po/de.po rc-scripts-0.4.13/po/de.po
+--- rc-scripts-0.4.13.orig/po/de.po 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/po/de.po 2015-02-06 13:30:49.147314244 +0000
+@@ -446,7 +446,7 @@ msgid " in cpuset %s..."
msgstr ""
#: .././rc.d/rc.sysinit:231
@@ -87,10 +100,10 @@ diff -ur rc-scripts-0.4.12.orig/po/de.po rc-scripts-0.4.12/po/de.po
msgstr ""
#: .././rc.d/init.d/netfs:154
-diff -ur rc-scripts-0.4.12.orig/po/pl.po rc-scripts-0.4.12/po/pl.po
---- rc-scripts-0.4.12.orig/po/pl.po 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/po/pl.po 2014-07-12 11:41:36.274000000 +0000
-@@ -443,8 +443,8 @@
+diff -urNp rc-scripts-0.4.13.orig/po/pl.po rc-scripts-0.4.13/po/pl.po
+--- rc-scripts-0.4.13.orig/po/pl.po 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/po/pl.po 2015-02-06 13:30:49.147314244 +0000
+@@ -443,8 +443,8 @@ msgid " in cpuset %s..."
msgstr " w cpusecie %s..."
#: .././rc.d/rc.sysinit:231
@@ -101,10 +114,10 @@ diff -ur rc-scripts-0.4.12.orig/po/pl.po rc-scripts-0.4.12/po/pl.po
#: .././rc.d/init.d/netfs:154
msgid "Active NFS mountpoints: "
-diff -ur rc-scripts-0.4.12.orig/po/rc-scripts.pot rc-scripts-0.4.12/po/rc-scripts.pot
---- rc-scripts-0.4.12.orig/po/rc-scripts.pot 2014-07-07 15:31:27.000000000 +0000
-+++ rc-scripts-0.4.12/po/rc-scripts.pot 2014-07-12 11:42:40.411000000 +0000
-@@ -172,7 +172,7 @@
+diff -urNp rc-scripts-0.4.13.orig/po/rc-scripts.pot rc-scripts-0.4.13/po/rc-scripts.pot
+--- rc-scripts-0.4.13.orig/po/rc-scripts.pot 2015-01-22 16:03:03.000000000 +0000
++++ rc-scripts-0.4.13/po/rc-scripts.pot 2015-02-06 13:30:49.148314244 +0000
+@@ -76,7 +76,7 @@ msgid "%s for %s exiting"
msgstr ""
#: .././rc.d/rc.sysinit:462
@@ -112,11 +125,11 @@ diff -ur rc-scripts-0.4.12.orig/po/rc-scripts.pot rc-scripts-0.4.12/po/rc-script
+msgid "\t\t\t%sPowered by %sTLD Linux%s"
msgstr ""
- #: .././lib/ifdown-vlan:45
-diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysinit
---- rc-scripts-0.4.12.orig/rc.d/rc.sysinit 2014-06-19 20:04:44.000000000 +0000
-+++ rc-scripts-0.4.12/rc.d/rc.sysinit 2014-07-12 11:41:36.275000000 +0000
-@@ -429,7 +429,7 @@
+ #: .././rc.d/init.d/netfs:138
+diff -urNp rc-scripts-0.4.13.orig/rc.d/rc.sysinit rc-scripts-0.4.13/rc.d/rc.sysinit
+--- rc-scripts-0.4.13.orig/rc.d/rc.sysinit 2015-01-22 16:01:18.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/rc.sysinit 2015-02-06 13:30:49.149314244 +0000
+@@ -429,7 +429,7 @@ if ! is_yes "$VSERVER" && [[ "$container
init_selinux
@@ -125,7 +138,7 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini
if [ -x /etc/rc.d/rc.live ]; then
/etc/rc.d/rc.live
fi
-@@ -460,7 +460,7 @@
+@@ -460,7 +460,7 @@ fi
# Print welcome message
@@ -134,10 +147,22 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini
if ! is_no "$RC_PROMPT"; then
nls -n "\t\t Press %sI%s to enter interactive startup" "$(termput setaf $CI)" "$(termput op)"
echo
-diff -ur rc-scripts-0.4.12.orig/src/setuidgid.c rc-scripts-0.4.12/src/setuidgid.c
---- rc-scripts-0.4.12.orig/src/setuidgid.c 2013-11-02 20:50:20.000000000 +0000
-+++ rc-scripts-0.4.12/src/setuidgid.c 2014-07-12 11:41:36.275000000 +0000
-@@ -47,7 +47,7 @@
+diff -urNp rc-scripts-0.4.13.orig/service rc-scripts-0.4.13/service
+--- rc-scripts-0.4.13.orig/service 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/service 2015-02-06 13:32:51.048314244 +0000
+@@ -123,7 +123,7 @@ status_all() {
+ done
+ }
+
+-VERSION="$(basename $0) ver. 0.91-pld"
++VERSION="$(basename $0) ver. 1.0-tld"
+ USAGE="Usage: $(basename $0) < option > | --status-all | \
+ [ service_name [ command | --full-restart ] ]"
+
+diff -urNp rc-scripts-0.4.13.orig/src/setuidgid.c rc-scripts-0.4.13/src/setuidgid.c
+--- rc-scripts-0.4.13.orig/src/setuidgid.c 2013-11-02 20:50:20.000000000 +0000
++++ rc-scripts-0.4.13/src/setuidgid.c 2015-02-06 13:30:49.149314244 +0000
+@@ -47,7 +47,7 @@ void die2(const char *msg1, const char *
exit(1);
}
void show_version() {
@@ -146,9 +171,9 @@ diff -ur rc-scripts-0.4.12.orig/src/setuidgid.c rc-scripts-0.4.12/src/setuidgid.
}
void version() {
show_version();
-diff -ur rc-scripts-0.4.12.orig/sysconfig/init-colors rc-scripts-0.4.12/sysconfig/init-colors
---- rc-scripts-0.4.12.orig/sysconfig/init-colors 2013-11-02 20:50:20.000000000 +0000
-+++ rc-scripts-0.4.12/sysconfig/init-colors 2014-07-12 11:41:36.276000000 +0000
+diff -urNp rc-scripts-0.4.13.orig/sysconfig/init-colors rc-scripts-0.4.13/sysconfig/init-colors
+--- rc-scripts-0.4.13.orig/sysconfig/init-colors 2013-11-02 20:50:20.000000000 +0000
++++ rc-scripts-0.4.13/sysconfig/init-colors 2015-02-06 13:30:49.149314244 +0000
@@ -1,11 +1,11 @@
-# Default PLD Linux colors.
+# Default TLD Linux colors.
@@ -163,10 +188,10 @@ diff -ur rc-scripts-0.4.12.orig/sysconfig/init-colors rc-scripts-0.4.12/sysconfi
CI="$RED" # Capital I color (press I to enter interactive startup)
CRESMAN="$GREEN" # "Resource Manager" color
CHARS="" # Characters displayed on the beginning of show line
-diff -ur rc-scripts-0.4.12.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.12/sysconfig/init-colors.gentoo
---- rc-scripts-0.4.12.orig/sysconfig/init-colors.gentoo 2013-11-02 20:50:20.000000000 +0000
-+++ rc-scripts-0.4.12/sysconfig/init-colors.gentoo 2014-07-12 11:41:36.276000000 +0000
-@@ -5,7 +5,7 @@
+diff -urNp rc-scripts-0.4.13.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.13/sysconfig/init-colors.gentoo
+--- rc-scripts-0.4.13.orig/sysconfig/init-colors.gentoo 2013-11-02 20:50:20.000000000 +0000
++++ rc-scripts-0.4.13/sysconfig/init-colors.gentoo 2015-02-06 13:30:49.149314244 +0000
+@@ -5,7 +5,7 @@ CDONE="$GREEN $BOLD" # DONE and WORK co
CBUSY="$MAGENTA $BOLD" # BUSY color
CFAIL="$RED $BOLD" # FAIL and DIED color
CPOWEREDBY="$BLUE $BOLD" # "Powered by" color
@@ -175,10 +200,10 @@ diff -ur rc-scripts-0.4.12.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.12/s
CI="$RED $BOLD" # Capital I color (press I to enter interactive startup)
CRESMAN="$GREEN $BOLD" # "Resource Manager" color
CHARS=" * " # Characters displayed on the beginning of show line
-diff -ur rc-scripts-0.4.12.orig/sysconfig/network rc-scripts-0.4.12/sysconfig/network
---- rc-scripts-0.4.12.orig/sysconfig/network 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/sysconfig/network 2014-07-12 11:41:36.276000000 +0000
-@@ -11,7 +11,7 @@
+diff -urNp rc-scripts-0.4.13.orig/sysconfig/network rc-scripts-0.4.13/sysconfig/network
+--- rc-scripts-0.4.13.orig/sysconfig/network 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/sysconfig/network 2015-02-06 13:30:49.151314244 +0000
+@@ -11,7 +11,7 @@ IPV4_NETWORKING=yes
# then set it in /etc/sysctl.conf
# Set hostname here
--
2.49.0