webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

the mkinitcpio sata hook must also removed if root is hd* because some

Browse Source 
also steal the ide devices
This commit is contained in:
Arne Fitzenreiter
2008-06-15 10:43:30 +02:00
parent 30abd97410
commit 2e95c21cf6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/updater/update.sh
View File

@@ -84,8 +84,9 @@ if [ "${ROOT:0:7}" == "/dev/sd" ]; then
sed -i "s| ide | |g" /etc/mkinitcpio.conf
else
if [ "${ROOT:0:7}" == "/dev/hd" ]; then
# Remove pata hook if root is on hda
# Remove pata & sata hook if root is on hda
sed -i "s| pata | |g" /etc/mkinitcpio.conf
sed -i "s| sata | |g" /etc/mkinitcpio.conf
fi
fi
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img

3
src/install+setup/install/main.c
View File

@@ -508,8 +508,9 @@ int main(int argc, char *argv[])
/* Remove the ide hook if we install sda */
replace("/harddisk/etc/mkinitcpio.conf", " ide ", " ");
} else {
/* Remove the pata hook if we install hda */
/* Remove the pata & sata hook if we install hda */
replace("/harddisk/etc/mkinitcpio.conf", " pata ", " ");
replace("/harddisk/etc/mkinitcpio.conf", " sata ", " ");
}
/* Going to make our initrd... */
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);