summaryrefslogtreecommitdiffstats
path: root/perl-install/bootloader.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-06 10:37:18 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-06 10:37:18 +0000
commit9f0124c4939104748f33559a2efc017d6f41b369 (patch)
treef53cd6bf4a4ede7c2bd49aba78576ac112cd9da5 /perl-install/bootloader.pm
parentd11b94c6f82a12bd0cc74843a5a5af59e82aeb56 (diff)
downloaddrakx-9f0124c4939104748f33559a2efc017d6f41b369.tar
drakx-9f0124c4939104748f33559a2efc017d6f41b369.tar.gz
drakx-9f0124c4939104748f33559a2efc017d6f41b369.tar.bz2
drakx-9f0124c4939104748f33559a2efc017d6f41b369.tar.xz
drakx-9f0124c4939104748f33559a2efc017d6f41b369.zip
escaped strings fixes
Diffstat (limited to 'perl-install/bootloader.pm')
-rw-r--r--perl-install/bootloader.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index b213808b6..816e31a4a 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -92,7 +92,7 @@ sub read_grub() {
next if /^\s*#/ || /^\s*$/;
chomp;
my ($keyword, $v) = /^\s*(\S+)\s*(.*?)\s*$/ or do {
- print STDERR "unknown line in /boot/grub/menu.lst: \"", chomp_($_), "\"\n";
+ print STDERR 'unknown line in /boot/grub/menu.lst: "', chomp_($_), q("\n);
next;
};
if ($keyword eq 'title') {
@@ -758,7 +758,7 @@ sub install_yaboot {
log::l("writing yaboot config to $f");
print F "#yaboot.conf - generated by DrakX";
- print F "init-message=\"\\n$bootloader->{'init-message'}\\n\"" if $bootloader->{'init-message'};
+ print F qq(init-message="\\n$bootloader->{'init-message'}\\n") if $bootloader->{'init-message'};
if ($bootloader->{boot}) {
print F "boot=$bootloader->{boot}";
@@ -796,7 +796,7 @@ sub install_yaboot {
}
#- xfs module on PPC requires larger initrd - say 6MB?
print F "\tinitrd-size=6144" if $bootloader->{xfsroot};
- print F "\tappend=\" $_->{append}\"" if $_->{append};
+ print F qq(\tappend=" $_->{append}") if $_->{append};
print F "\tread-write" if $_->{'read-write'};
print F "\tread-only" if !$_->{'read-write'};
} else {
@@ -872,7 +872,7 @@ sub install_silo {
print F "\tpartition=$_->{partition}" if $_->{partition};
print F "\troot=$_->{root}" if $_->{root};
print F "\tinitrd=$initrd" if $_->{initrd};
- print F "\tappend=\"$1\"" if $_->{append} =~ /^\s*"?(.*?)"?\s*$/;
+ print F qq(\tappend="$1") if $_->{append} =~ /^\s*"?(.*?)"?\s*$/;
print F "\tread-write" if $_->{'read-write'};
print F "\tread-only" if !$_->{'read-write'};
}
@@ -953,7 +953,7 @@ sub write_lilo_conf {
local $bootloader->{default} = make_label_lilo_compatible($bootloader->{default});
$bootloader->{$_} and print F "$_=$bootloader->{$_}" foreach qw(boot map install vga default keytable);
$bootloader->{$_} and print F $_ foreach qw(linear geometric compact prompt nowarn restricted);
- print F "append=\"$bootloader->{append}\"" if $bootloader->{append};
+ print F qq(append="$bootloader->{append}") if $bootloader->{append};
print F "password=", $bootloader->{password} if $bootloader->{password}; #- also done by msec
print F "timeout=", round(10 * $bootloader->{timeout}) if $bootloader->{timeout};
print F "serial=", $1 if get_append($bootloader, 'console') =~ /ttyS(.*)/;
@@ -974,7 +974,7 @@ sub write_lilo_conf {
if ($_->{type} eq "image") {
print F "\troot=$_->{root}" if $_->{root};
print F "\tinitrd=", $file2fullname->($_->{initrd}) if $_->{initrd};
- print F "\tappend=\"$_->{append}\"" if $_->{append};
+ print F qq(\tappend="$_->{append}") if $_->{append};
print F "\tvga=$_->{vga}" if $_->{vga};
print F "\tread-write" if $_->{'read-write'};
print F "\tread-only" if !$_->{'read-write'};