diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | boot-conf.in | 2 | ||||
| -rw-r--r-- | boot.pl.in | 8 | ||||
| -rwxr-xr-x | disks-conf.in | 2 | ||||
| -rwxr-xr-x | memory-conf.in | 2 | ||||
| -rwxr-xr-x | network-conf.in | 9 | ||||
| -rw-r--r-- | network.pl.in | 186 | ||||
| -rw-r--r-- | parse.pl.in | 12 | ||||
| -rwxr-xr-x | print-conf.in | 2 | ||||
| -rw-r--r-- | replace.pl.in | 48 | ||||
| -rwxr-xr-x | time-conf.in | 4 | ||||
| -rw-r--r-- | users-conf.in | 9 |
12 files changed, 249 insertions, 54 deletions
@@ -1,3 +1,21 @@ +2001-05-15 Arturo Espinosa Aldama <arturo@ximian.com> + + * replace.pl.in (xst_replace_interfaces_stanza_value): function renamed + from "interface_stanza". + + * network.pl.in (xst_network_deb22_replace_bootproto): function renamed. + + * *-conf.in: Added support for Debian Woody. Woody users will have to + do echo 'woody' > /etc/debian_version + + * boot.pl.in: debian-woody works as redhat-6.2. + * network.pl.in: created new interface parse/replace tables for debian woody, + because the /etc/network/interfaces format changes. Partialy implemented + (only auto stanza supported, but not mapping stanza). Not tested. + * parse.pl.in: stanza scanning routines no longer assume stanzas are iface + type. + * replace.pl.in: same here. Added auto_stanza create. + 2001-05-16 Hans Petter Jansson <hpj@ximian.com> * share.pl.in (xst_share_smb_info_get_name): Implement. @@ -90,6 +108,7 @@ * internetsharing-conf.in (xst_ishare_rules_get_ipchains): implement. +>>>>>>> 1.202 2001-05-14 Chema Celorio <chema@celorio.com> * time-conf.in: tested in RH 7.1. Add the platform diff --git a/boot-conf.in b/boot-conf.in index 0786333..070c022 100644 --- a/boot-conf.in +++ b/boot-conf.in @@ -55,7 +55,7 @@ require "___scriptsdir___/boot.pl"; $name = "boot"; $version = "0.1.0"; @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", - "mandrake-7.2", "debian-2.2"); + "mandrake-7.2", "debian-2.2", "debian-woody"); $description =<<"end_of_description;"; Configures Boot manager (Only LILO at the moment). @@ -451,7 +451,9 @@ sub xst_boot_conf_set "redhat-7.0" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", - "debian-2.2" => "redhat-6.2" + + "debian-2.2" => "redhat-6.2", + "debian-woody" => "redhat-6.2" ); my %dist_tables = @@ -495,7 +497,9 @@ sub xst_boot_conf_get "redhat-7.0" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", - "debian-2.2" => "redhat-6.2" + + "debian-2.2" => "redhat-6.2", + "debian-woody" => "redhat-6.2" ); my %dist_tables = diff --git a/disks-conf.in b/disks-conf.in index ae897d1..e02186d 100755 --- a/disks-conf.in +++ b/disks-conf.in @@ -46,7 +46,7 @@ require "___scriptsdir___/filesys.pl"; $name = "disks"; $version = "0.1.0"; @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", - "mandrake-7.2", "debian-2.2"); + "mandrake-7.2", "debian-2.2", "debian-woody"); $description =<<"end_of_description;"; Configures locally mounted partitioned media. diff --git a/memory-conf.in b/memory-conf.in index a211281..f60baa7 100755 --- a/memory-conf.in +++ b/memory-conf.in @@ -49,7 +49,7 @@ $DEBUG = 1; # 1 == command; no debug. 2 == no commands, just report. 3 == report $name = "memory"; $version = "0.1.0"; @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", - "debian-2.2", "mandrake-7.2"); + "mandrake-7.2", "debian-2.2", "debian-woody"); $description =<<"end_of_description;"; Configures main and swap memory. diff --git a/network-conf.in b/network-conf.in index 4bb2da3..89b6af4 100755 --- a/network-conf.in +++ b/network-conf.in @@ -58,13 +58,8 @@ require "___scriptsdir___/network.pl"; $name = "network"; $version = "0.1.0"; -@platforms = ("debian-2.2", - "redhat-5.2", - "redhat-6.0", - "redhat-6.1", - "redhat-6.2", - "redhat-7.0", - "mandrake-7.2"); +@platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", + "mandrake-7.2", "debian-2.2", "debian-woody"); $description =<<"end_of_description;"; Configures all network parameters and interfaces. diff --git a/network.pl.in b/network.pl.in index 7211d86..012c443 100644 --- a/network.pl.in +++ b/network.pl.in @@ -163,7 +163,7 @@ sub xst_network_debian_ifaces_get_existing { my (@ret, @stanzas, $stanza); - @stanzas = &xst_parse_interfaces_stanzas ("$xst_prefix/etc/network/interfaces"); + @stanzas = &xst_parse_interfaces_stanzas ("$xst_prefix/etc/network/interfaces", "iface"); foreach $stanza (@stanzas) { @@ -255,7 +255,8 @@ sub xst_network_get_file "redhat-6.2" => \&xst_network_rh62_get_file, "redhat-7.0" => \&xst_network_rh62_get_file, "mandrake-7.2" => \&xst_network_rh62_get_file, - "debian-2.2" => \&xst_network_deb22_get_file + "debian-2.2" => \&xst_network_deb22_get_file, + "debian-woody" => \&xst_network_deb22_get_file ); $proc = $dist_map{$xst_dist}; @@ -418,7 +419,7 @@ sub xst_network_deb22_interface_delete my $old_hash = $_[0]; my $dev = $$old_hash{"dev"}; - &xst_replace_interfaces_stanza_delete ("$xst_prefix/etc/network/interfaces", $dev); + &xst_replace_interfaces_iface_stanza_delete ("$xst_prefix/etc/network/interfaces", $dev); $login = $old_hash{"login"}; if ($login ne "") @@ -706,7 +707,7 @@ sub xst_network_deb22_parse_bootproto ); &xst_report_enter (); - @stanzas = &xst_parse_interfaces_stanzas ($file); + @stanzas = &xst_parse_interfaces_stanzas ($file, "iface"); foreach $stanza (@stanzas) { @@ -755,7 +756,7 @@ sub xst_network_deb22_replace_bootproto $value = $dev_to_method{$i} if $iface =~ /^$i/; } - return &xst_replace_interface_stanza_value ($file, $iface, 2, $proto_name_to_debian{$value}); + return &xst_replace_interfaces_stanza_value ($file, $iface, 2, $proto_name_to_debian{$value}); } sub xst_network_debian_parse_remote_address @@ -794,6 +795,71 @@ sub xst_network_debian_replace_remote_address return $ret; } +sub xst_network_debian_woody_get_auto_by_stanza +{ + my ($file, $iface) = @_; + my (@stanzas, $stanza, $i); + + @stanzas = &xst_parse_interfaces_stanzas ($file, "auto"); + + foreach $stanza (@stanzas) + { + foreach $i (@$stanza) + { + return $stanza if $i eq $iface; + } + } + + return 0; +} + +sub xst_network_debian_woody_get_auto +{ + my ($file, $iface) = @_; + + return 1 if &xst_network_debian_woody_get_auto_by_stanza ($file, $iface); + + # Couldn't get auto param through auto stanzas, revert to potato method. + return &xst_parse_interfaces_option_kw_not ($file, $iface, "noauto"); +} + +sub xst_network_debian_woody_set_auto +{ + my ($file, $iface, $value) = @_; + + if (&xst_parse_interfaces_option_kw ($file, $iface, "noauto")) + { + # Potato method. We keep compatible. + return &xst_replace_interfaces_option_kw_not ($file, $iface, "noauto", $value); + } + + my ($buff, $line_no, $stanza); + my ($pre_space, $line, $line_arr); + my ($found); + + $buff = &xst_file_buffer_load ($file); + &xst_file_buffer_join_lines ($buff); + $line_no = 0; + + while (($found = &xst_replace_interfaces_get_next_stanza ($buff, \$line_no, "auto")) != -1) + { + last if $$buff[$line_no] =~ s/[ \t]$iface$//; + # I'm including the hash here, although the man page says it's not supported. + last if $$buff[$line_no] =~ s/[ \t]$iface([\# \t])/\1/; + } + + if ($found == -1) + { + &xst_replace_interfaces_auto_stanza_create ($buff, $iface); + } + else + { + $$buff[$line_no] =~ s/auto[ \t]*$//; + } + + return &xst_file_buffer_save ($buff, $file); +} + sub xst_network_ensure_loopback_interface { my ($interface) = @_; @@ -805,7 +871,8 @@ sub xst_network_ensure_loopback_interface "redhat-6.2" => "lo", "redhat-7.0" => "lo", "mandrake-7.2" => "lo", - "debian-2.2" => "lo" + "debian-2.2" => "lo", + "debian-woody" => "lo" ); $dev = $dist_map {$xst_dist}; @@ -892,7 +959,8 @@ sub xst_network_get_parse_table "redhat-6.2" => "redhat-6.2", "redhat-7.0" => "redhat-7.0", "mandrake-7.2" => "redhat-6.2", - "debian-2.2" => "debian-2.2" + "debian-2.2" => "debian-2.2", + "debian-woody" => "debian-2.2" ); my %dist_tables = @@ -1014,7 +1082,8 @@ sub xst_network_get_interfaces_parse_table "redhat-6.2" => "redhat-6.2", "redhat-7.0" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", - "debian-2.2" => "debian-2.2" + "debian-2.2" => "debian-2.2", + "debian-woody" => "debian-woody" ); my %dist_tables = @@ -1109,6 +1178,55 @@ sub xst_network_get_interfaces_parse_table [ "enabled", \&xst_network_interface_active, IFACE, \&xst_network_active_interfaces_get ] ] + }, + + # Basicly the same as debian-2.2, but the "auto" option changes. + # Other stuff may be later found to be different. + "debian-woody" => + { + ifaces_get => \&xst_network_debian_ifaces_get_existing, + fn => + { + INTERFACES => "/etc/network/interfaces", + IFACE => "#iface#", + CHAT => "/etc/chatscripts/%wvsection%", + PPP_OPTIONS => "/etc/ppp/peers/%wvsection%", + PAP => "/etc/ppp/pap-secrets", + CHAP => "/etc/ppp/chap-secrets" }, + table => + [ + [ "user", \&xst_parse_trivial, 0 ], # not supported. + [ "dev", \&xst_parse_trivial, IFACE ], + [ "bootproto", \&xst_network_deb22_parse_bootproto, [INTERFACES, IFACE]], + [ "auto", \&xst_network_debian_woody_get_auto, [INTERFACES, IFACE]], + [ "name", \&xst_parse_interfaces_option_str, [INTERFACES, IFACE], "name" ], + [ "address", \&xst_parse_interfaces_option_str, [INTERFACES, IFACE], "address" ], + [ "netmask", \&xst_parse_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], + [ "broadcast", \&xst_parse_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ], + [ "network", \&xst_parse_interfaces_option_str, [INTERFACES, IFACE], "network" ], + [ "gateway", \&xst_parse_interfaces_option_str, [INTERFACES, IFACE], "gateway" ], + [ "wvsection", \&xst_parse_interfaces_option_str, [INTERFACES, IFACE], "provider" ], + [ "peerdns", \&xst_parse_kw, PPP_OPTIONS, "usepeerdns" ], + [ "dns1", \&xst_parse_trivial, "" ], # not supported. + [ "dns2", \&xst_parse_trivial, "" ], # not supported. + [ "mtu", \&xst_parse_split_first_str, PPP_OPTIONS, "mtu", "[ \t]+" ], + [ "mru", \&xst_parse_split_first_str, PPP_OPTIONS, "mru", "[ \t]+" ], + [ "remote_address", \&xst_network_debian_parse_remote_address, [INTERFACES, IFACE]], + [ "login", \&xst_parse_split_first_str, PPP_OPTIONS, "user", "[ \t]+" ], + [ "password", \&xst_network_get_pap_passwd, PAP, "%login%" ], + [ "password", \&xst_network_get_pap_passwd, CHAP, "%login%" ], + [ "serial_port", \&xst_network_get_ppp_options_re, PPP_OPTIONS, "^(/dev/[^ \t]+)" ], + [ "serial_speed", \&xst_network_get_ppp_options_re, PPP_OPTIONS, "^([0-9]+)" ], + [ "ppp_options", \&xst_network_get_ppp_options_unsup, PPP_OPTIONS ], + [ "set_default_gw", \&xst_parse_kw, PPP_OPTIONS, "defaultroute" ], + [ "debug", \&xst_parse_kw, PPP_OPTIONS, "debug" ], + [ "persist", \&xst_parse_kw, PPP_OPTIONS, "persist" ], + [ "serial_escapechars", \&xst_parse_split_first_str, PPP_OPTIONS, "escape", "[ \t]+" ], + [ "serial_hwctl", \&xst_parse_kw, PPP_OPTIONS, "crtscts" ], + [ "phone_number", \&xst_parse_chat, CHAT, "^atd[^0-9]*([0-9, -]+)" ], + [ "enabled", \&xst_network_interface_active, IFACE, + \&xst_network_active_interfaces_get ] + ] } ); @@ -1253,7 +1371,8 @@ sub xst_network_get_interface_replace_table "redhat-6.2" => "redhat-6.2", "redhat-7.0" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", - "debian-2.2" => "debian-2.2" + "debian-2.2" => "debian-2.2", + "debian-woody" => "debian-woody" ); my %dist_tables = @@ -1318,7 +1437,54 @@ sub xst_network_get_interface_replace_table [ # not sup [ "user", \&xst_parse_sh_bool, IFCFG, USERCTL ], [ "bootproto", \&xst_network_deb22_replace_bootproto, [INTERFACES, IFACE]], - [ "Auto", \&xst_replace_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ], + [ "auto", \&xst_replace_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ], + [ "name", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "name" ], + [ "address", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "address" ], + [ "netmask", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], + [ "broadcast", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ], + [ "network", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "network" ], + [ "gateway", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "gateway" ], + [ "wvsection", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "provider" ], + [ "peerdns", \&xst_replace_kw, PPP_OPTIONS, "usepeerdns" ], +# not sup [ "dns1", \&xst_replace_sh, IFCFG, DNS1 ], +# not sup [ "dns2", \&xst_replace_sh, IFCFG, DNS2 ], + [ "mtu", \&xst_replace_join_first_str, PPP_OPTIONS, "mtu", "[ \t]+" ], + [ "mru", \&xst_replace_join_first_str, PPP_OPTIONS, "mru", "[ \t]+" ], + [ "remote_address", \&xst_network_debian_replace_remote_address, [INTERFACES, IFACE]], + [ "login", \&xst_replace_join_first_str, PPP_OPTIONS, "user", "[ \t]+" ], + [ "serial_port", \&xst_network_set_ppp_options_re, PPP_OPTIONS, "^(/dev/[^ \t]+)" ], + [ "serial_speed", \&xst_network_set_ppp_options_re, PPP_OPTIONS, "^([0-9]+)" ], + [ "wvsection", \&xst_network_set_ppp_options_connect, PPP_OPTIONS ], + [ "ppp_options", \&xst_network_set_ppp_options_unsup, PPP_OPTIONS ], + [ "set_default_gw", \&xst_replace_kw, PPP_OPTIONS, "defaultroute" ], + [ "debug", \&xst_replace_kw, PPP_OPTIONS, "debug" ], + [ "persist", \&xst_replace_kw, PPP_OPTIONS, "persist" ], + [ "serial_escapechars", \&xst_replace_join_first_str, PPP_OPTIONS, "escape", "[ \t]+" ], + [ "serial_hwctl", \&xst_replace_kw, PPP_OPTIONS, "crtscts" ], + [ "phone_number", \&xst_replace_chat, CHAT, "^atd[^0-9]*([0-9, -]+)" ], + ] + }, + + # Basicly the same as debian-2.2, but the "auto" option changes. + # Other stuff may be later found to be different. + "debian-woody" => + { + iface_set => \&xst_network_rh62_interface_activate, # They use the same ifup/ifdown cmds. + iface_delete => \&xst_network_deb22_interface_delete, + ifaces_get => \&xst_network_debian_ifaces_get_existing, + fn => + { + INTERFACES => "/etc/network/interfaces", + IFACE => "#iface#", + CHAT => "/etc/chatscripts/%wvsection%", + PPP_OPTIONS => "/etc/ppp/peers/%wvsection%", + PAP => "/etc/ppp/pap-secrets", + CHAP => "/etc/ppp/chap-secrets" }, + table => + [ +# not sup [ "user", \&xst_parse_sh_bool, IFCFG, USERCTL ], + [ "bootproto", \&xst_network_deb22_replace_bootproto, [INTERFACES, IFACE]], + [ "auto", \&xst_network_debian_woody_set_auto, [INTERFACES, IFACE]], [ "name", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "name" ], [ "address", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "address" ], [ "netmask", \&xst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], diff --git a/parse.pl.in b/parse.pl.in index 2fb894c..153ebfd 100644 --- a/parse.pl.in +++ b/parse.pl.in @@ -660,15 +660,15 @@ sub xst_parse_interfaces_line_read # Return ref to an array with the stanza params split. sub xst_parse_interfaces_get_next_stanza { - my $fd = $_[0]; + my ($fd, $stanza_type) = @_; my $line; while (($line = &xst_parse_interfaces_line_read ($fd)) != -1) { $_ = $$line; - if (/^iface[ \t]/) + if (/^$stanza_type[ \t]+[^ \t]/) { - s/^iface[ \t]+//; + s/^$stanza_type[ \t]+//; return [ split ("[ \t]+", $_) ]; } } @@ -698,13 +698,13 @@ sub xst_parse_interfaces_get_next_option # Get all stanzas from file. Return array. sub xst_parse_interfaces_stanzas { - my ($file) = @_; + my ($file, $stanza_type) = @_; my ($fd, @res); $fd = &xst_file_open_read_from_names ($file); $res = undef; - while (($_ = &xst_parse_interfaces_get_next_stanza ($fd)) != -1) + while (($_ = &xst_parse_interfaces_get_next_stanza ($fd, $stanza_type)) != -1) { push @res, $_; } @@ -723,7 +723,7 @@ sub xst_parse_interfaces_option_tuple $fd = &xst_file_open_read_from_names ($file); - while (($stanza = &xst_parse_interfaces_get_next_stanza ($fd)) != -1) + while (($stanza = &xst_parse_interfaces_get_next_stanza ($fd, "iface")) != -1) { if ($$stanza[0] eq $iface) { diff --git a/print-conf.in b/print-conf.in index 2af22a8..bc70db5 100755 --- a/print-conf.in +++ b/print-conf.in @@ -58,7 +58,7 @@ require "___scriptsdir___/print.pl"; $name = "print"; $version = "0.1.0"; @platforms = ("redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", - "debian-2.2", "mandrake-7.2"); + "mandrake-7.2", "debian-2.2", "debian-woody"); $description =<<"end_of_description;"; Configures the lpr subsystem. diff --git a/replace.pl.in b/replace.pl.in index d8a5f3c..a83a901 100644 --- a/replace.pl.in +++ b/replace.pl.in @@ -466,16 +466,16 @@ sub xst_replace_ini_bool # NOTE: $line_no is a scalar ref. and gives the position of next stanza. sub xst_replace_interfaces_get_next_stanza { - my ($buff, $line_no) = @_; + my ($buff, $line_no, $stanza_type) = @_; my ($i, $line); while ($$line_no <= $#$buff) { $_ = $$buff[$$line_no]; $_ = &xst_parse_interfaces_line_clean ($_); - if (/^iface[ \t]/) + if (/^$stanza_type[ \t]+[^ \t]/) { - s/^iface[ \t]+//; + s/^$stanza_type[ \t]+//; return [ split ("[ \t]+", $_) ]; } $$line_no ++; @@ -484,6 +484,14 @@ sub xst_replace_interfaces_get_next_stanza return -1; } +sub xst_replace_interfaces_line_is_stanza +{ + my ($line) = @_; + + return 1 if $line =~ /^(iface|auto|mapping)[ \t]+[^ \t]/; + return 0; +} + # Scan for next option. An option is something that is # not a stanza. Return key/value tuple ref, -1 if not found. # $$line_no will contain position. @@ -501,7 +509,7 @@ sub xst_replace_interfaces_get_next_option if (!/^$/) { - return [ split ("[ \t]+", $_, 2) ] if (!/^iface[ \t]/); + return [ split ("[ \t]+", $_, 2) ] if (! &xst_replace_interfaces_line_is_stanza ($_)); $$line_no -= $empty_lines; return -1; } @@ -536,12 +544,12 @@ sub xst_replace_interfaces_option_locate } # Locate stanza line for $iface in $buff, starting at $$line_no. -sub xst_replace_interfaces_stanza_locate +sub xst_replace_interfaces_iface_stanza_locate { my ($buff, $line_no, $iface) = @_; my $stanza; - while (($stanza = &xst_replace_interfaces_get_next_stanza ($buff, $line_no)) != -1) + while (($stanza = &xst_replace_interfaces_get_next_stanza ($buff, $line_no, "iface")) != -1) { return 1 if ($$stanza[0] eq $iface); $$line_no ++; @@ -550,8 +558,16 @@ sub xst_replace_interfaces_stanza_locate return 0; } +sub xst_replace_interfaces_auto_stanza_create +{ + my ($buff, @ifaces) = @_; + + push @$buff, "\n"; + push @$buff, "auto " . join (" ", @ifaces) . "\n"; +} + # Append a stanza for $iface to buffer. -sub xst_replace_interfaces_stanza_create +sub xst_replace_interfaces_iface_stanza_create { my ($buff, $iface) = @_; @@ -560,7 +576,7 @@ sub xst_replace_interfaces_stanza_create } # Delete $iface stanza and all its option lines. -sub xst_replace_interfaces_stanza_delete +sub xst_replace_interfaces_iface_stanza_delete { my ($file, $iface) = @_; my ($buff, $line_no, $stanza); @@ -569,7 +585,7 @@ sub xst_replace_interfaces_stanza_delete &xst_file_buffer_join_lines ($buff); $line_no = 0; - return -1 if (!&xst_replace_interfaces_stanza_locate ($buff, \$line_no, $iface)); + return -1 if (!&xst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface)); $$buff[$line_no] = ""; $line_no ++; @@ -584,7 +600,7 @@ sub xst_replace_interfaces_stanza_delete } # Find $iface stanza line and replace $pos value (ie the method). -sub xst_replace_interface_stanza_value +sub xst_replace_interfaces_stanza_value { my ($file, $iface, $pos, $value) = @_; my ($buff, $line_no, $stanza); @@ -594,11 +610,11 @@ sub xst_replace_interface_stanza_value &xst_file_buffer_join_lines ($buff); $line_no = 0; - if (!&xst_replace_interfaces_stanza_locate ($buff, \$line_no, $iface)) + if (!&xst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface)) { $line_no = 0; - &xst_replace_interfaces_stanza_create ($buff, $iface); - &xst_replace_interfaces_stanza_locate ($buff, \$line_no, $iface); + &xst_replace_interfaces_iface_stanza_create ($buff, $iface); + &xst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface); } $line = $$buff[$line_no]; @@ -627,11 +643,11 @@ sub xst_replace_interfaces_option_str &xst_file_buffer_join_lines ($buff); $line_no = 0; - if (!&xst_replace_interfaces_stanza_locate ($buff, \$line_no, $iface)) + if (!&xst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface)) { $line_no = 0; - &xst_replace_interfaces_stanza_create ($buff, $iface); - &xst_replace_interfaces_stanza_locate ($buff, \$line_no, $iface); + &xst_replace_interfaces_iface_stanza_create ($buff, $iface); + &xst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface); } $line_no++; diff --git a/time-conf.in b/time-conf.in index f66e828..426c00c 100755 --- a/time-conf.in +++ b/time-conf.in @@ -50,8 +50,8 @@ require "___scriptsdir___/replace.pl"; $name = "time"; $version = "0.1.0"; -@platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", - "redhat-7.0", "redhat-7.1", "mandrake-7.2", "debian-2.2"); +@platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", "redhat-7.1", + "mandrake-7.2", "debian-2.2", "debian-woody"); $description =<<"end_of_description;"; Configures your system clock, timezone and time server list. diff --git a/users-conf.in b/users-conf.in index a8caa2c..9ad5bc7 100644 --- a/users-conf.in +++ b/users-conf.in @@ -56,13 +56,8 @@ $TEST_NIS = 0; $name = "users"; $version = "0.1.0"; -@platforms = ("redhat-5.2", - "redhat-6.0", - "redhat-6.1", - "redhat-6.2", - "redhat-7.0", - "mandrake-7.2", - "debian-2.2"); +@platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", + "mandrake-7.2", "debian-2.2", "debian-woody"); $description =<<"end_of_description;"; Manages system users. |