diff --git a/srcpkgs/initramfs-tools/files/init b/srcpkgs/initramfs-tools/files/init index 5a1ea200e5e..30526b1cd3e 100755 --- a/srcpkgs/initramfs-tools/files/init +++ b/srcpkgs/initramfs-tools/files/init @@ -1,5 +1,10 @@ #!/bin/busybox sh +# For systemd to know how much time is spent in initramfs. +if [ -x /bin/systemd-timestamp ]; then + RD_TIMESTAMP="$(/bin/systemd-timestamp)" +fi + echo "Starting up the initramfs, please wait..." [ -d /run ] || mkdir -m 0755 /run @@ -272,5 +277,6 @@ mount -o move /proc ${rootmnt}/proc mount -o move /run ${rootmnt}/run # Chain to real filesystem -exec switch_root ${rootmnt} ${init} "$@" <${rootmnt}/dev/console >${rootmnt}/dev/console +exec env -i "RD_TIMESTAMP=$RD_TIMESTAMP" \ + switch_root ${rootmnt} ${init} "$@" <${rootmnt}/dev/console >${rootmnt}/dev/console panic "Could not execute run-init." diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template index 8328f0b2f1e..83002100bea 100644 --- a/srcpkgs/initramfs-tools/template +++ b/srcpkgs/initramfs-tools/template @@ -1,9 +1,12 @@ # Template file for 'initramfs-tools' pkgname=initramfs-tools -_localver=1 # This is the XBPS version +_localver=2 # This is the XBPS version _distver=0.102 # This should match debian version version=${_distver}.${_localver} -fulldepends="cpio util-linux gawk findutils sed grep gzip bzip2 xz udev busybox>=1.19.2 klibc-resume kbd>=1.15.3_5 kmod" +noextract=yes +noarch=yes +triggers="initramfs-tools" +fulldepends="cpio util-linux gawk findutils sed grep gzip bzip2 xz udev>=183 busybox>=1.19.2 klibc-resume kbd>=1.15.3_5 kmod" short_desc="Tools for generating an initramfs" maintainer="Juan RP " homepage="http://code.google.com/p/xbps" @@ -16,9 +19,6 @@ long_desc=" space. Any boot loader with initrd support is able to load an initramfs archive." -noextract=yes -noarch=yes -triggers="initramfs-tools" conf_files=" /etc/$pkgname/initramfs.conf /etc/$pkgname/update-initramfs.conf @@ -40,7 +40,6 @@ make_dirs=" /var/lib/$pkgname 0755 0 0 " - do_install() { # /etc config files vinstall $FILESDIR/conf/initramfs.conf 644 etc/$pkgname