diff --git a/Makefile b/Makefile index ad8f444..052faa2 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ all install clean distclean: PACKAGE=sysvinit VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p' doc/Changelog) -SVLOGIN=$(shell svn info | sed -rn '/Repository Root:/{ s|.*//(.*)\@.*|\1|p }') +GITLOGIN=$(shell git remote -v | head -n 1 | cut -f 3 -d '/' | cut -f 1 -d '@') override TMP:=$(shell mktemp -d $(VERSION).XXXXXXXX) override TARBALL:=$(TMP)/$(PACKAGE)-$(VERSION).tar.bz2 override SFTPBATCH:=$(TMP)/$(VERSION)-sftpbatch @@ -15,7 +15,7 @@ dist: $(TARBALL) rm -rf $(TMP) upload: $(SFTPBATCH) - echo @sftp -b $< $(SVLOGIN)@dl.sv.nongnu.org:/releases/$(PACKAGE) + echo @sftp -b $< $(GITLOGIN)@dl.sv.nongnu.org:/releases/$(PACKAGE) rm -rf $(TMP) $(SFTPBATCH): $(TARBALL).sig diff --git a/doc/Changelog b/doc/Changelog index a8be14e..aa67744 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,8 @@ sysvinit (2.89) UNRELEASED; urgency=low [ Jesse Smith ] + * Removed two sleep calls when we are doing sync anyway to make sure + data is being written. Speeds up reboot time by about two seconds. * Fixed Clang compiler warning regarding variable data parameters to sprintf(). * Updated top-level Makefile to work with git repo instead of old svn repo. * Removed unused variables and findtty() function in bootlogd @@ -44,7 +46,7 @@ sysvinit (2.89) UNRELEASED; urgency=low We will use /etc/nologin and let distros patch to suit their own preference. * Updated halt.8 man page with corrections from Christoph Anton Mitterer. - * Confirme we have applied patch from Bjarni Ingi Gislason + * Confirmed we have applied patch from Bjarni Ingi Gislason which fixes typo in fstab-decode man page. * Applied Debian patch to allow init to build on GNU Hurd. (Credit: Roger Leigh) @@ -70,7 +72,7 @@ sysvinit (2.89) UNRELEASED; urgency=low effort and pull in a new dependency on libmount. * Problem with pidof breaks after prelink (Savannah bug #34992) fixed. Patch supplied by Dave Dykstra. - * Patch to automatically spawn agetty on kernel consoles + * Patch to automatically spawn a getty on kernel consoles The feature is useful for developers and admins that occasionally need to boot with e.g. console=ttyS0. The built in default can be overridden via inittab for each device. An diff --git a/src/halt.c b/src/halt.c index 5b9430c..7dbafa2 100644 --- a/src/halt.c +++ b/src/halt.c @@ -266,7 +266,11 @@ int main(int argc, char **argv) if (do_sync) { sync(); - sleep(2); + /* Sync should be fine on its own for making sure data is written. + We probably call shutdown after this anyway to clean up. + -- Jesse + sleep(2); + */ } if (do_ifdown) diff --git a/src/shutdown.c b/src/shutdown.c index f85bc38..1208c57 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -359,7 +359,8 @@ void fastdown() #endif /* script failed or not present: do it ourself. */ - sleep(1); /* Give init the chance to collect zombies. */ + /* Give init the chance to collect zombies. */ + /* sleep(1); */ /* Record the fact that we're going down */ write_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");