[Pkg-sysvinit-commits] r436 - in sysvinit/trunk/debian: . initscripts initscripts/doc initscripts/share

Thomas Hood jdthood-guest at costa.debian.org
Wed Dec 21 18:15:04 UTC 2005 

Author: jdthood-guest
Date: 2005-12-21 18:15:03 +0000 (Wed, 21 Dec 2005)
New Revision: 436

Added:
   sysvinit/trunk/debian/initscripts/doc/
   sysvinit/trunk/debian/initscripts/doc/README.Debian
Removed:
   sysvinit/trunk/debian/initscripts/share/doc/
Modified:
   sysvinit/trunk/debian/rules
Log:
Fix installation of initscripts docs; remove doc variable from rules

Added: sysvinit/trunk/debian/initscripts/doc/README.Debian
===================================================================
--- sysvinit/trunk/debian/initscripts/doc/README.Debian	2005-12-21 15:52:08 UTC (rev 435)
+++ sysvinit/trunk/debian/initscripts/doc/README.Debian	2005-12-21 18:15:03 UTC (rev 436)
@@ -0,0 +1,25 @@
+tmpfs
+-----
+
+Around kernel version 2.3.3x, a memory based filesystem was
+introduced to support POSIX shared memory, called 'shmfs'. 
+Later this filesystem was extended for general usage and a
+"tmpfs" could be mounted. The CONFIG_TMPFS kernel compile option
+must be set to 'y', as it is for Debian kernels.
+
+Early in the 2.4 kernel series, shmfs was renamed to tmpfs, but
+could be mounted using either 'shmfs' or 'tmpfs'. Starting with
+kernel version 2.5.44, the 'shmfs' alias was dropped.
+
+Confusingly, in kernels 2.3.x - 2.5.43 where both "shmfs" and
+"tmpfs" are present, disabling CONFIG_TMPFS actually removes
+support for shmfs, but tmpfs is still listed in /proc/filesystems
+to support SYSV and POSIX shared memory, and it should still be
+mounted under /dev/shm.
+
+Recommendation: always enable CONFIG_TMPFS and always mount
+using the tmpfs type. Forget about shmfs.
+
+Tmpfs can be used as memory filesystem, so you can limit tmpfs
+max size using /etc/default/tmpfs to prevent tmpfs from using
+up all system memory.

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2005-12-21 15:52:08 UTC (rev 435)
+++ sysvinit/trunk/debian/rules	2005-12-21 18:15:03 UTC (rev 436)
@@ -4,7 +4,6 @@
 #
 
 tmp     = $(shell pwd)/debian/tmp
-doc	= /usr/share/doc
 
 SHELL	= /bin/bash
 LC_ALL	= POSIX
@@ -49,13 +48,13 @@
 	install -d -g root -m 755 -o root $(tmp)/usr/share/sysvinit
 	install -d -g root -m 755 -o root $(tmp)/usr/include
 	install -d -g root -m 755 -o root $(tmp)/var/log/fsck
-	install -d -g root -m 755 -o root $(tmp)$(doc)/sysvinit
-	install -g root -m 644 doc/Changelog $(tmp)$(doc)/sysvinit/changelog
+	install -d -g root -m 755 -o root $(tmp)/usr/share/doc/sysvinit
+	install -g root -m 644 doc/Changelog $(tmp)/usr/share/doc/sysvinit/changelog
 	install -g root -m 644 debian/changelog \
-		$(tmp)$(doc)/sysvinit/changelog.Debian
+		$(tmp)/usr/share/doc/sysvinit/changelog.Debian
 	install -g root -m 644 debian/README.runlevels \
-		$(tmp)$(doc)/sysvinit
-	gzip -9f $(tmp)$(doc)/sysvinit/{README.runlevels,changelog*}
+		$(tmp)/usr/share/doc/sysvinit
+	gzip -9f $(tmp)/usr/share/doc/sysvinit/{README.runlevels,changelog*}
 	if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \
 	then \
 		install -g root -m 644 -o root \
@@ -89,8 +88,8 @@
 	rm -f $(tmp)/bin/mountpoint
 	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
 	install -g root -m 644 -o root debian/README \
-	  $(tmp)$(doc)/sysvinit/copyright
-	cat COPYRIGHT >> $(tmp)$(doc)/sysvinit/copyright
+	  $(tmp)/usr/share/doc/sysvinit/copyright
+	cat COPYRIGHT >> $(tmp)/usr/share/doc/sysvinit/copyright
 	install -g root -m 755 debian/postinst $(tmp)/DEBIAN/postinst
 #	make -C debian/startpar DESTDIR=$(tmp) install
 	dpkg-shlibdeps src/init # debian/startpar/startpar
@@ -110,11 +109,12 @@
 	install -d -g root -m 755 -o root $(tmp)/lib/init
 	install -d -g root -m 755 -o root $(tmp)/usr/share/initscripts
 	install -d -g root -m 755 -o root $(tmp)/var/lib/initscripts
-	install -d -g root -m 755 -o root $(tmp)$(doc)/initscripts
+	install -d -g root -m 755 -o root $(tmp)/usr/share/doc/initscripts
+	install -g root -m 644 debian/initscripts/doc/* $(tmp)/usr/share/doc/initscripts
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
-		> $(tmp)$(doc)/initscripts/changelog.Debian
-	chmod 644 $(tmp)$(doc)/initscripts/changelog.Debian
-	gzip -9f $(tmp)$(doc)/initscripts/*
+		> $(tmp)/usr/share/doc/initscripts/changelog.Debian
+	chmod 644 $(tmp)/usr/share/doc/initscripts/changelog.Debian
+	gzip -9f $(tmp)/usr/share/doc/initscripts/*
 	cp -af debian/initscripts/share/* $(tmp)/usr/share/initscripts
 	cp -af debian/initscripts/etc/* $(tmp)/etc
 	cp -af debian/initscripts/lib/* $(tmp)/lib
@@ -146,7 +146,7 @@
 		debian/initscripts/lintian.overrides \
 		$(tmp)/usr/share/lintian/overrides/initscripts
 	install -g root -m 644 -o root debian/initscripts/copyright \
-	  $(tmp)$(doc)/initscripts/copyright
+	  $(tmp)/usr/share/doc/initscripts/copyright
 	install -g root -m 755 debian/initscripts/preinst  $(tmp)/DEBIAN
 	install -g root -m 755 debian/initscripts/postinst $(tmp)/DEBIAN
 	install -g root -m 644 -o root debian/initscripts/conffiles \
@@ -167,12 +167,12 @@
 	-rm -rf $(tmp)
 	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,etc}
 	install -d -g root -m 755 -o root $(tmp)/usr/share
-	install -d -g root -m 755 -o root $(tmp)$(doc)/sysv-rc
+	install -d -g root -m 755 -o root $(tmp)/usr/share/doc/sysv-rc
+	install -g root -m 644 debian/sysv-rc/doc/* $(tmp)/usr/share/doc/sysv-rc
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
-		> $(tmp)$(doc)/sysv-rc/changelog.Debian
-	chmod 644 $(tmp)$(doc)/sysv-rc/changelog.Debian
-	install -g root -m 644 debian/sysv-rc/doc/* $(tmp)$(doc)/sysv-rc
-	gzip -9f $(tmp)$(doc)/sysv-rc/*
+		> $(tmp)/usr/share/doc/sysv-rc/changelog.Debian
+	chmod 644 $(tmp)/usr/share/doc/sysv-rc/changelog.Debian
+	gzip -9f $(tmp)/usr/share/doc/sysv-rc/*
 	install -d -g root -m 755 -o root $(tmp)/etc/rc{0,1,2,3,4,5,6}.d
 	cp -af debian/sysv-rc/etc/* $(tmp)/etc
 	chmod 755 $(tmp)/etc/init.d/[a-z]*
@@ -202,7 +202,7 @@
 		debian/sysv-rc/lintian.overrides \
 		$(tmp)/usr/share/lintian/overrides/sysv-rc
 	install -g root -m 644 -o root debian/sysv-rc/copyright \
-	  $(tmp)$(doc)/sysv-rc/copyright
+	  $(tmp)/usr/share/doc/sysv-rc/copyright
 	install -g root -m 755 debian/sysv-rc/postinst $(tmp)/DEBIAN/postinst
 	install -g root -m 755 debian/sysv-rc/postrm $(tmp)/DEBIAN/postrm
 	dpkg-gencontrol -psysv-rc -P$(tmp) -isp

More information about the Pkg-sysvinit-commits mailing list