diff --git a/mxgrub/mxgrub b/mxgrub/mxgrub index 824d44d..b5e72bf 100755 --- a/mxgrub/mxgrub +++ b/mxgrub/mxgrub @@ -160,7 +160,7 @@ sub update_grub_cfg { for my $label (@MARIUX) { my $image=label_to_image($label); - $kernellist.="menuentry \"$label\" --unrestricted { save_env chosen ; linux /boot/$image crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz }\n"; + $kernellist.="\tmenuentry \"$label\" --unrestricted { save_env chosen ; linux /boot/$image crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz }\n"; } my $GRUB_CFG_NEW=<<"EOF"; @@ -177,7 +177,7 @@ if [ -e /etc/local/USB.usb ]; then menuentry "mariuxUSB" --unrestricted { save_env chosen ; linux /boot/bzImage.x86_64 crashkernel=256M root=LABEL=rootusb ro ; initrd /boot/grub/initramfs.igz } else - $kernellist +$kernellist if [ \$chosen ]; then set default=\$chosen @@ -186,15 +186,15 @@ else fi EOF - if (-e '/boot/grub/grub.cfg') { - my $GRUB_CFG_OLD=read_file('/boot/grub/grub.cfg'); + if (-e './grub.cfg') { + my $GRUB_CFG_OLD=read_file('./grub.cfg'); if ($GRUB_CFG_NEW eq $GRUB_CFG_OLD) { # warn "/boot/grub/grub.cfg: no change\n"; return; } } - write_file_atomic('/boot/grub/grub.cfg',$GRUB_CFG_NEW); - warn "/boot/grub/grub.cfg: updated\n"; + write_file_atomic('./grub.cfg',$GRUB_CFG_NEW); + warn "./grub.cfg: updated\n"; } sub cmd_list { diff --git a/netlog/netlog b/netlog/netlog index 8652d66..522444b 100755 --- a/netlog/netlog +++ b/netlog/netlog @@ -143,7 +143,9 @@ sub filter { } /netlog test/ and return 'TEST'; - + + /WEBCAM/ and return 'CAM'; + $proc eq 'InRow RC' and return 'INROW'; if ($proc eq 'UPS') { return 'UPS' unless /(Started|Passed) a self-test./;