main/mkinitramfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The following changes were made:

Browse Source 
* Corrected zfs detection in init
  * Moved to use CONFIG rather than usher
This commit is contained in:
Jay Larson
2018-08-04 06:26:50 -05:00
parent dcf90f69d6
commit 35668887a4
6 changed files with 11 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CONFIG/usr/share/mkinitramfs/bins/default Symbolic link
View File

@@ -0,0 +1 @@
../default-bins

1
CONFIG/usr/share/mkinitramfs/mods/default Symbolic link
View File

@@ -0,0 +1 @@
../default-mods

5
Makefile
View File

@@ -8,7 +8,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
DEPENDS = coreutils,cpio,eudev,gzip,perl,psmisc,sed,util-linux DEPENDS = coreutils,cpio,dash,eudev,gzip,perl,psmisc,sed,util-linux
ARCH = x86_64 ARCH = x86_64
URL = http://snaplinux.org URL = http://snaplinux.org
REPO = core REPO = core
@@ -37,5 +37,6 @@ clean:
@rm -rvf $(ROOT) \ @rm -rvf $(ROOT) \
$(SNAPINFO) \ $(SNAPINFO) \
$(MANIFEST) \ $(MANIFEST) \
$(FILES) $(FILES) \
$(CONFIG)

26
SNAP/usher
View File

@@ -1,26 +0,0 @@
#!/bin/sh
set -e
case $1 in
preinst)
exit 0
;;
postinst)
if [ ! -f /usr/share/mkinitramfs/bins/default ]; then
cp /usr/share/mkinitramfs/default-bins \
/usr/share/mkinitramfs/bins/default
fi
if [ ! -f /usr/share/mkinitramfs/mods/default ]; then
cp /usr/share/mkinitramfs/default-mods \
/usr/share/mkinitramfs/mods/default
fi
;;
prerm)
exit 0
;;
postrm)
exit 0
;;
esac

22
SRC/mkinitramfs/init
View File

@@ -18,16 +18,9 @@ rorw="ro"
rootflags= rootflags=
rootdev= rootdev=
[ -d /dev ] || mkdir -m 0755 /dev
[ -d /root ] || mkdir -m 0700 /root
[ -d /sys ] || mkdir /sys
[ -d /proc ] || mkdir /proc
[ -d /tmp ] || mkdir /tmp
mkdir -p /var/lock
mount -n -t devtmpfs devtmpfs /dev mount -n -t devtmpfs devtmpfs /dev
mount -t proc -o nodev,noexec,nosuid proc /proc mount -n -t proc proc /proc
mount -t sysfs -o nodev,noexec,nosuid sysfs /sys mount -n -t sysfs sysfs /sys
mount -n -t tmpfs tmpfs /run mount -n -t tmpfs tmpfs /run
read -r cmdline < /proc/cmdline read -r cmdline < /proc/cmdline
@@ -78,12 +71,10 @@ case "$root" in
;; ;;
esac esac
echo > /sys/kernel/uevent_helper
/sbin/udevd --daemon --resolve-names=never /sbin/udevd --daemon --resolve-names=never
udevadm trigger udevadm trigger
udevadm settle udevadm settle
[ -n "$rootdelay" ] && sleep "$rootdelay"
[ -f /etc/mdadm.conf ] && mdadm -As [ -f /etc/mdadm.conf ] && mdadm -As
[ -x /sbin/vgchange ] && /sbin/vgchange --sysinit -a y [ -x /sbin/vgchange ] && /sbin/vgchange --sysinit -a y
@@ -91,11 +82,8 @@ if [ -n "$zfs" ]; then
zpool import rpool -N || error "Failed importing rpool" zpool import rpool -N || error "Failed importing rpool"
fi fi
if [ -n "$rootflags" ]; then [ -n "$rootdelay" ] && sleep "$rootdelay"
rootflags="$rootflags,$rorw" [ -n "$rootflags" ] && rootflags="$rootflags,$rorw" || rootflags="$rorw"
else
rootflags="$rorw"
fi
mkdir /.root mkdir /.root
@@ -103,6 +91,6 @@ if ! mount -n -t "$rootfstype" -o "$rootflags" "$rootdev" /.root ; then
error "Failed to mount root filesystem" error "Failed to mount root filesystem"
fi fi
udevadm control --exit killall -w udevd
exec switch_root /.root "$init" "$@" exec switch_root /.root "$init" "$@"

2
SRC/mkinitramfs/mkinitramfs
View File

@@ -6,7 +6,7 @@ use warnings;
use POSIX qw( uname ); use POSIX qw( uname );
use Data::Dumper; use Data::Dumper;
use constant VERSION => '0.5'; use constant VERSION => '0.7';
sub build { sub build {
my $kernel = shift; my $kernel = shift;