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

The following changes were made:

Browse Source 
* Added URL, REPO, and BRIEF to Makefile
  * usher now uses /bin/sh
  * Removed TARGET from usher
This commit is contained in:
Jay Larson
2018-04-04 14:20:41 -05:00
parent 0a7a028b03
commit dcf90f69d6
4 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SRC/mkinitramfs/init
View File

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

14
SRC/mkinitramfs/mkinitramfs
View File

@@ -6,7 +6,7 @@ use warnings;
use POSIX qw( uname );
use Data::Dumper;
use constant VERSION => '0.4';
use constant VERSION => '0.5';
sub build {
my $kernel = shift;
@@ -22,6 +22,12 @@ sub build {
mkdir( "$tmpdir/$_", 0755 ) || die( "mkdir(): $tmpdir/$_: $!" );
}
if ( -f '/etc/hostid' ) {
if ( system( "cp -p /etc/hostid $tmpdir/etc" ) ) {
die( "Failed copying hostid" );
}
}
symlink( 'lib', "$tmpdir/lib64" ) ||
die( "symlynk(): $tmpdir/lib64: $!" );
symlink( '/proc/mounts', "$tmpdir/etc/mtab" ) ||
@@ -71,7 +77,7 @@ sub build {
if ( system( "cp -p /etc/modprobe.d/* $tmpdir/etc/modprobe.d" ) ) {
die( "Failed copying data from modprobe.d\n" );
}
if ( system( "cp -rp /etc/udev/{rules.d,udev.conf}"
if ( system( "cp -rp /etc/udev/rules.d /etc/udev/udev.conf"
. " $tmpdir/etc/udev" ) ) {
die( "Failed copying udev data\n" );
}
@@ -87,8 +93,8 @@ sub build {
}
if ( system( "cp /lib/modules/$kernel->{'version'}/"
. "modules.{builtin,order} $tmpdir/lib/modules/"
. "$kernel->{'version'}" ) ) {
. "modules.builtin /lib/modules/$kernel->{'version'}/modules.order"
. " $tmpdir/lib/modules/$kernel->{'version'}" ) ) {
die( "Failed copying module data\n" );
}
if ( system( "depmod -b $tmpdir $kernel->{'version'}" ) ) {