From 404f23ce096d6186062f68db607edac4a7068d61 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 14 Jul 2015 13:04:35 +0000
Subject: [PATCH] - merged TLDize patch
---
doc/net-scripts.txt | 6 +++---
doc/sysvinitfiles | 2 +-
hwprofile | 3 ---
inittab | 2 +-
lib/functions | 6 +++---
po/de.po | 2 +-
po/pl.po | 4 ++--
rc.d/rc.sysinit | 4 ++--
service | 2 +-
src/setuidgid.c | 2 +-
sysconfig/init-colors | 4 ++--
sysconfig/init-colors.gentoo | 2 +-
sysconfig/network | 2 +-
13 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/doc/net-scripts.txt b/doc/net-scripts.txt
index ccc52b0..256d660 100644
--- a/doc/net-scripts.txt
+++ b/doc/net-scripts.txt
@@ -145,11 +145,11 @@ Files in /etc/sysconfig/interfaces/
INITSCRIPT=<modem command>
string which initialises your modem. Usualy something like
AT&F0&C1&D2
- (PLD Linux rc-scripts specific option)
+ (TLD Linux rc-scripts specific option)
DATAFORCHAT=<list of variables>
List of variables which should be exported to chat script.
Used mostly for passing USERNAME and PASSWORD into it. (see below)
- (PLD Linux rc-scripts specific option)
+ (TLD Linux rc-scripts specific option)
PEERDNS=yes|no
IPV6_PPP=yes|no
use IPv6 for ppp
@@ -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.
- In PLD Linux version of rc-scripts, this file is parsed by shell
+ In TLD Linux version of rc-scripts, this file is parsed by shell
(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 --git a/doc/sysvinitfiles b/doc/sysvinitfiles
index 24b0c60..771a948 100644
--- a/doc/sysvinitfiles
+++ b/doc/sysvinitfiles
@@ -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 --git a/hwprofile b/hwprofile
index 4f24a9e..10b7707 100755
--- a/hwprofile
+++ b/hwprofile
@@ -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 --git a/inittab b/inittab
index d8b4c94..9d00363 100644
--- a/inittab
+++ b/inittab
@@ -7,7 +7,7 @@
# Modified for RHS Linux by Marc Ewing and Donnie Barnes
#
-# Default runlevel. The runlevels used by PLD Linux are:
+# Default runlevel. The runlevels used by TLD Linux are:
# 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 --git a/lib/functions b/lib/functions
index bbdbd64..98de9cc 100644
--- a/lib/functions
+++ b/lib/functions
@@ -5,7 +5,7 @@
#
# Author: Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
# Hacked by: Greg Galloway and Marc Ewing
-# Modified for PLD Linux by:
+# Modified for TLD Linux by:
# Marek Obuchowicz <elephant@pld-linux.org>
# Arkadiusz MiÅkiewicz <misiek@pld-linux.org>
# MichaÅ Kochanowicz <mkochano@pld-linux.org>
@@ -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
-CPLD="$GREEN" # "PLD Linux Distribution" color
+CTLD="$GREEN" # "TLD Linux" color
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
@@ -417,7 +417,7 @@ msg_usage() {
nls "Usage: %s" "$*"
}
-# Some functions to handle PLD Linux-style messages
+# Some functions to handle TLD Linux-style messages
show() {
local text len time
diff --git a/po/de.po b/po/de.po
index 59fcaf5..b99014e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -446,7 +446,7 @@ msgid " in cpuset %s..."
msgstr ""
#: .././rc.d/rc.sysinit:231
-msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s"
+msgid "\t\t\t%sPowered by %sTLD Linux%s"
msgstr ""
#: .././rc.d/init.d/netfs:154
diff --git a/po/pl.po b/po/pl.po
index 9c7dfa6..4284e4a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -443,8 +443,8 @@ msgid " in cpuset %s..."
msgstr " w cpusecie %s..."
#: .././rc.d/rc.sysinit:231
-msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s"
-msgstr "\t\t\t%sNapÄdzane przez %sPLD Linux Distribution%s"
+msgid "\t\t\t%sPowered by %sTLD Linux%s"
+msgstr "\t\t\t%sNapÄdzane przez %sTLD Linux%s"
#: .././rc.d/init.d/netfs:154
msgid "Active NFS mountpoints: "
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index f7f0eea..121e48f 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -425,7 +425,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
init_selinux
- # PLD Linux LiveCD support
+ # TLD Linux LiveCD support
if [ -x /etc/rc.d/rc.live ]; then
/etc/rc.d/rc.live
fi
@@ -456,7 +456,7 @@ fi
# Print welcome message
-nls "\t\t\t%sPowered by %sPLD Linux Distribution%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CPLD)" "$(termput op)"
+nls "\t\t\t%sPowered by %sTLD Linux%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CTLD)" "$(termput op)"
if ! is_no "$RC_PROMPT"; then
nls -n "\t\t Press %sI%s to enter interactive startup" "$(termput setaf $CI)" "$(termput op)"
echo
diff --git a/service b/service
index f882bdb..9184a4f 100755
--- a/service
+++ b/service
@@ -114,7 +114,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 --git a/src/setuidgid.c b/src/setuidgid.c
index 9c57cf6..946e53a 100644
--- a/src/setuidgid.c
+++ b/src/setuidgid.c
@@ -47,7 +47,7 @@ void die2(const char *msg1, const char *msg2) {
exit(1);
}
void show_version() {
- fprintf(stderr, "%s $Rev$ (PLD Linux rc-scripts)\n", progname);
+ fprintf(stderr, "%s $Rev$ (TLD Linux rc-scripts)\n", progname);
}
void version() {
show_version();
diff --git a/sysconfig/init-colors b/sysconfig/init-colors
index 500e22e..1632fdb 100644
--- a/sysconfig/init-colors
+++ b/sysconfig/init-colors
@@ -1,11 +1,11 @@
-# Default PLD Linux colors.
+# Default TLD Linux colors.
CBRACKETS="$CYAN" # brackets [ ] color
CDONE="$GREEN" # DONE and WORK color
CBUSY="$MAGENTA" # BUSY color
CFAIL="$RED" # FAIL and DIED color
CPOWEREDBY="$CYAN" # "Powered by" color
-CPLD="$GREEN" # "PLD Linux Distribution" color
+CTLD="$GREEN" # "TLD Linux" color
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 --git a/sysconfig/init-colors.gentoo b/sysconfig/init-colors.gentoo
index 8987a5b..e9d331e 100644
--- a/sysconfig/init-colors.gentoo
+++ b/sysconfig/init-colors.gentoo
@@ -5,7 +5,7 @@ CDONE="$GREEN $BOLD" # DONE and WORK color
CBUSY="$MAGENTA $BOLD" # BUSY color
CFAIL="$RED $BOLD" # FAIL and DIED color
CPOWEREDBY="$BLUE $BOLD" # "Powered by" color
-CPLD="$GREEN $BOLD" # "PLD Linux Distribution" color
+CTLD="$GREEN $BOLD" # "TLD Linux" color
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 --git a/sysconfig/network b/sysconfig/network
index e71987a..d38b105 100644
--- a/sysconfig/network
+++ b/sysconfig/network
@@ -11,7 +11,7 @@ IPV4_NETWORKING=yes
# then set it in /etc/sysctl.conf
# Set hostname here
-HOSTNAME=pldmachine
+HOSTNAME=tldlinux
# Allow udev to create /etc/sysconfig/interfaces/ifcfg-* automatically?
# See /lib/udev/net_helper for details.
--
2.49.0