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

flash-images: merge normal and scon to one image.

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2018-04-12 16:21:20 +02:00
parent d1d06e66c0
commit 6b56624445
6 changed files with 286 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/initscripts/system/firstsetup
View File

@@ -5,24 +5,16 @@ if [ -e /var/ipfire/main/firstsetup_ok ]; then
exit 0;
fi
# Edit the serial console entry at /etc/inittab matching to console parameter.
ser_console() {
while test x"$1" != x
do
case $1 in
console=*)
scon=${1##console=};
sed -i -e "s|^7:2345:respawn:/sbin/agetty.*|7:2345:respawn:/sbin/agetty ${scon%%,*}|g" /etc/inittab
shift
;;
*)
shift
;;
esac
done
}
cmdline=`cat /proc/cmdline`
ser_console $cmdline
# disable consoles if tty2 are not present
if [ ! -e /dev/tty2 ]; then
# Disable console on tty2-6
sed -i -e "s|2:2345:respawn:|#2:2345:respawn:|g" /etc/inittab
sed -i -e "s|3:2345:respawn:|#3:2345:respawn:|g" /etc/inittab
sed -i -e "s|4:2345:respawn:|#4:2345:respawn:|g" etc/inittab
sed -i -e "s|5:2345:respawn:|#5:2345:respawn:|g" /etc/inittab
sed -i -e "s|6:2345:respawn:|#6:2345:respawn:|g" /etc/inittab
fi
# reload inittab
/sbin/init q
#

16
src/initscripts/system/partresize
View File

@@ -18,6 +18,7 @@
case "${1}" in
start)
if [ -e "/.partresize" ]; then
boot_mesg "Mounting root file system in read/write mode ..."
mount -o remount,rw / > /dev/null
evaluate_retval
@@ -28,6 +29,21 @@ case "${1}" in
(exit ${failed})
evaluate_retval
mount /boot > /dev/null
if [ -e /boot/grub/grub.cfg ]; then
# swtich permanent to serial console if it was selected on first boot
if [ ! "$(grep "console=ttyS0" /proc/cmdline)" == "" ]; then
# Enable also serial console on GRUB
echo "GRUB_TERMINAL=\"serial console\"" >> /etc/default/grub
echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub
sed -i -e "s|panic=10|& console=ttyS0,115200n8|g" /etc/default/grub
fi
/usr/local/bin/update-bootloader
fi
umount /boot > /dev/null
sleep 30
# Detect device
mount | while read -r dev tmp1 mountpoint tmp2; do
[ "${dev}" = "rootfs" ] && continue