aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiloslav Trmac <mitr@volny.cz>2006-07-29 21:47:50 +0000
committerMiloslav Trmac <mitr@volny.cz>2006-07-29 21:47:50 +0000
commit10b07d34e516432e01adcf92230e0b5cfb100cd2 (patch)
tree6276ee4f15d78bc5e27632aeee84bbc35b9340e3
parentcaad46e53fa88271d05587af39d26c6dd7c9841d (diff)
downloadinitscripts-10b07d34e516432e01adcf92230e0b5cfb100cd2.tar
initscripts-10b07d34e516432e01adcf92230e0b5cfb100cd2.tar.gz
initscripts-10b07d34e516432e01adcf92230e0b5cfb100cd2.tar.bz2
initscripts-10b07d34e516432e01adcf92230e0b5cfb100cd2.tar.xz
initscripts-10b07d34e516432e01adcf92230e0b5cfb100cd2.zip
- sys-unconfig: Avoid mishaps with e.g. (sys-unconfig --help) (#189501)
- po/Makefile (POTFILES): Extract msgids from more files.
-rw-r--r--po/Makefile4
-rw-r--r--sys-unconfig7
2 files changed, 10 insertions, 1 deletions
diff --git a/po/Makefile b/po/Makefile
index 271ca28b..d750ccc4 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -10,7 +10,9 @@ NLSPACKAGE = initscripts
CATALOGS = $(shell ls *.po)
FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS))
-POTFILES = /etc/rc.d/init.d/* /etc/rc.d/rc /etc/rc.d/rc.* $(shell ls /etc/sysconfig/network-scripts/* | grep -v ifcfg-)
+POTFILES = /etc/ppp/ip* /etc/rc.d/init.d/* /etc/rc.d/rc /etc/rc.d/rc.* \
+ $(shell ls /etc/sysconfig/network-scripts/* | grep -v ifcfg-) \
+ /sbin/service /usr/sbin/sys-unconfig
all: $(NLSPACKAGE).pot $(FMTCATALOGS)
diff --git a/sys-unconfig b/sys-unconfig
index 2b9a3c58..e6b3416d 100644
--- a/sys-unconfig
+++ b/sys-unconfig
@@ -1,4 +1,11 @@
#!/bin/sh
+. /etc/init.d/functions
+
+if [ $# -ne 0 ]; then
+ echo $"Usage: sys-unconfig" >&2
+ exit 1
+fi
+
touch /.unconfigured
halt