Skip to content
Jump to bottom

Format fix #3

Closed
wants to merge 2 commits into from
Closed

Format fix #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
202d328
new filter for webcams
david Jun 27, 2016
13b8e0a
grub.cfg is loking nice again:)
david Jun 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mxgrub/mxgrub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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
Expand All @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion netlog/netlog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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./;
Expand Down