Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #635 from ertugerata/master

Browse Source 
mkinitramfs fix booting live usb. thanks @rmys
This commit is contained in:
Ertuğrul Erata
2017-04-03 23:58:46 +03:00
committed by GitHub
parent 0968d34a6f 1f1ad0824c
commit ce855e9b22
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/tools/mkinitramfs/comar/pakhandler.py
+1 -1
View File
@@ -21,4 +21,4 @@ def cleanupPackage(metapath, filepath):
pass pass
def postCleanupPackage(metapath, filepath): def postCleanupPackage(metapath, filepath):
pass generate_initramfs(filepath)
kernel/tools/mkinitramfs/files/init
+9 -9
View File
@@ -90,11 +90,11 @@ probe_kms() {
for device in /sys/bus/pci/devices/*/boot_vga; do for device in /sys/bus/pci/devices/*/boot_vga; do
[ -f $device ] || continue [ -f $device ] || continue
info "Loading KMS driver" info "Loading KMS driver"
grep -q 1 $device && modprobe -q `cat ${device%boot_vga}modalias` grep -q 1 $device && modprobe -bq `cat ${device%boot_vga}modalias`
done done
if [ ! -c /dev/fb0 ]; then if [ ! -c /dev/fb0 ]; then
echo "options uvesafb scroll=ywrap mtrr=0 nocrtc=1 mode_option=1024x768-32" > /etc/modprobe.d/uvesafb.conf echo "options uvesafb scroll=ywrap mtrr=0 nocrtc=1 mode_option=1024x768-32" > /etc/modprobe.d/uvesafb.conf
modprobe -q uvesafb modprobe -bq uvesafb
fi fi
} }
@@ -105,7 +105,7 @@ probe_pci_devices() {
[ -f $module ] || continue [ -f $module ] || continue
MODULES="$MODULES $(cat $module)" MODULES="$MODULES $(cat $module)"
done done
modprobe -q $MODULES modprobe -bqa $MODULES
} }
probe_usb_devices() { probe_usb_devices() {
@@ -115,13 +115,12 @@ probe_usb_devices() {
[ -f $module ] || continue [ -f $module ] || continue
MODULES="$MODULES $(cat $module)" MODULES="$MODULES $(cat $module)"
done done
modprobe -q $MODULES modprobe -bqa $MODULES
} }
probe_raid() { probe_raid() {
info "Probing RAID devices" info "Probing RAID devices"
#modprobe -bq dm-mod raid0 raid1 raid10 raid456 modprobe -bqa dm-mod raid0 raid1 raid10 raid456
modprobe -q raid0 raid1 raid10 raid456
if [ -x /sbin/mdadm ] if [ -x /sbin/mdadm ]
then then
/sbin/mdadm --examine --scan > /etc/mdadm.conf /sbin/mdadm --examine --scan > /etc/mdadm.conf
@@ -131,7 +130,7 @@ probe_raid() {
probe_lvm() { probe_lvm() {
info "Probing LVM devices" info "Probing LVM devices"
# modprobe -q dm-mod modprobe -qa dm-mod
if [ -x /sbin/lvm ] if [ -x /sbin/lvm ]
then then
/sbin/lvm vgscan --ignorelockingfailure &> /dev/null /sbin/lvm vgscan --ignorelockingfailure &> /dev/null
@@ -145,7 +144,7 @@ probe_virtio_devices() {
[ -f $module ] || continue [ -f $module ] || continue
MODULES="$MODULES $(cat $module)" MODULES="$MODULES $(cat $module)"
done done
modprobe -q $MODULES modprobe -bqa $MODULES
} }
################################# #################################
@@ -159,6 +158,7 @@ mount_rootfs() {
} }
find_live_mount() { find_live_mount() {
modprobe -bqa usb-storage udf
if [ "$#" -gt "0" ] if [ "$#" -gt "0" ]
then then
for x in $* for x in $*
@@ -519,7 +519,7 @@ then
manage_tmpfs manage_tmpfs
# modprobe filesystems that are not in kernel, for live disks # modprobe filesystems that are not in kernel, for live disks
modprobe -q nls_cp857 nls_utf8 vfat modprobe -qa nls_cp857 nls_utf8 vfat
for i in `seq 50` for i in `seq 50`
do do
kernel/tools/mkinitramfs/pspec.xml
+1 -1
View File
@@ -45,7 +45,7 @@
<History> <History>
<Update release="4"> <Update release="4">
<Date>2017-03-29</Date> <Date>2017-04-03</Date>
<Version>1.0.7</Version> <Version>1.0.7</Version>
<Comment>fix #626</Comment> <Comment>fix #626</Comment>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>