emo/sysvinit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.06'

Browse Source
This commit is contained in:
Jesse 2022-12-16 12:49:07 -04:00
commit e33a890ea5
5 changed files with 739 additions and 3754 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/Changelog
View File

@ -1,4 +1,17 @@
sysvinit (3.05) unreleased; urgency=low sysvinit (3.06) unreleased; urgency=low
* Mark Hindley fixed typo in es.po
* Mark Hindley cleaned up translation code in src/Makefile.
* Drop sulogin from Debian build. Removed libcrypt-dev dependency.
* Fixed pt translation pages which were failing due to mis-matched
open/close tags.
* Makefile now respects ROOT prefix when setting up pidof-to-killall5
symbolic link.
* Removed redundant translation files from man directory.
* Makefile now respects DESTDIR. User can specify either ROOT= or DESTDIR=
to set install prefix.
sysvinit (3.05) released; urgency=low
* Helge Kreutzmann provided updated Makefile for * Helge Kreutzmann provided updated Makefile for
translation of manual pages. This has been added translation of manual pages. This has been added
to the man directory. to the man directory.

700
man/po/de.po
View File

File diff suppressed because it is too large Load Diff

2
man/po/es.po
View File

@ -2477,7 +2477,7 @@ msgid ""
"Michael Haardt E<.ME .>" "Michael Haardt E<.ME .>"
msgstr "" msgstr ""
"B<Init> fue escrito por E<.MT miquels@\\:cistron\\:.nl> Miquel van " "B<Init> fue escrito por E<.MT miquels@\\:cistron\\:.nl> Miquel van "
"Smoorenburg E<.ME>. Esta página de manual fue escrita por E<.MT lederer@\\:" "Smoorenburg E<.ME .> Esta página de manual fue escrita por E<.MT lederer@\\:"
"francium\\:.informatik\\:.uni-bonn\\:.de> Sebastian Lederer E<.ME> y " "francium\\:.informatik\\:.uni-bonn\\:.de> Sebastian Lederer E<.ME> y "
"modificada por E<.MT u31b3hs@\\:pool\\:.informatik\\:.rwth-aachen\\:.de> " "modificada por E<.MT u31b3hs@\\:pool\\:.informatik\\:.rwth-aachen\\:.de> "
"Michael Haardt E<.ME .>" "Michael Haardt E<.ME .>"

3750
man/sysvinit-man.pot
View File

File diff suppressed because it is too large Load Diff

26
src/Makefile
View File

@ -40,8 +40,8 @@ endif
ifeq ($(DISTRO),Debian) ifeq ($(DISTRO),Debian)
CPPFLAGS+= -DACCTON_OFF CPPFLAGS+= -DACCTON_OFF
SBIN += sulogin bootlogd SBIN += bootlogd
MAN8 += sulogin.8 bootlogd.8 MAN8 += bootlogd.8
MANDB := MANDB :=
endif endif
@ -65,6 +65,9 @@ BIN += mountpoint
MAN1 += mountpoint.1 MAN1 += mountpoint.1
endif endif
MANPAGES:=$(MAN1) $(MAN5) $(MAN8)
MANPAGES+=$(subst ../man/,,$(foreach man,$(MANPAGES),$(wildcard ../man/??/$(man))))
ID = $(shell id -u) ID = $(shell id -u)
BIN_OWNER = root BIN_OWNER = root
BIN_GROUP = root BIN_GROUP = root
@ -96,6 +99,8 @@ else
SULOGINLIBS = SULOGINLIBS =
endif endif
ROOT ?= $(DESTDIR)
# Additional libs for GNU libc. # Additional libs for GNU libc.
ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),) ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
SULOGINLIBS += -lcrypt SULOGINLIBS += -lcrypt
@ -212,6 +217,7 @@ install: all
# $(INSTALL_DIR) $(ROOT)/etc/ # $(INSTALL_DIR) $(ROOT)/etc/
$(INSTALL_DIR) $(ROOT)/etc/inittab.d $(INSTALL_DIR) $(ROOT)/etc/inittab.d
# $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/ # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
<<<<<<< HEAD
ln -sf halt $(ROOT)$(base_sbindir)/reboot ln -sf halt $(ROOT)$(base_sbindir)/reboot
ln -sf halt $(ROOT)$(base_sbindir)/poweroff ln -sf halt $(ROOT)$(base_sbindir)/poweroff
ln -sf init $(ROOT)$(base_sbindir)/telinit ln -sf init $(ROOT)$(base_sbindir)/telinit
@ -237,6 +243,22 @@ install: all
for man in $(MAN8) $(subst ../man/,,$(foreach man,$(MAN8),$(wildcard ../man/??/$(man)))); do \ for man in $(MAN8) $(subst ../man/,,$(foreach man,$(MAN8),$(wildcard ../man/??/$(man)))); do \
$(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man8/$$man; \ $(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man8/$$man; \
sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man8/$$man ; \ sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man8/$$man ; \
=======
ln -sf halt $(ROOT)/sbin/reboot
ln -sf halt $(ROOT)/sbin/poweroff
ln -sf init $(ROOT)/sbin/telinit
ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
ln -sf last $(ROOT)/usr/bin/lastb; \
fi
$(INSTALL_DIR) $(ROOT)/usr/include/
$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
for man in $(MANPAGES) ; do \
targetdir=$(ROOT)$(MANDIR)/$$(dirname $$man)/man$${man##*.}; \
$(INSTALL_DIR) $$targetdir; \
$(INSTALL_DATA) ../man/$$man $$targetdir/$$(basename $$man); \
sed -i "1{ $(MANDB); }" $$targetdir/$$(basename $$man); \
>>>>>>> 3.06
done done
ifeq ($(ROOT),) ifeq ($(ROOT),)
# #