diff options
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 5 | ||||
| -rwxr-xr-x | scripts/rl-system.init | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index b30b0593..475ae699 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -25,6 +25,11 @@ if ! grep -q '^tss' /etc/passwd; then adduser --system --group --shell /usr/sbin/nologin --home /var/lib/tpm tss fi +# Remove leftover udev files from earlier release +if [ -d /etc/udev/rules.d/ ]; then + rm -f /etc/udev/rules.d/*vyatta-net.rules +fi + # Force screenblanker to be off, it can be enabled later if desired if [ -f /etc/console-tools/config ]; then sed -i -e '/^POWERDOWN/s/=.*$/=0/' \ diff --git a/scripts/rl-system.init b/scripts/rl-system.init index fddea32a..3106d593 100755 --- a/scripts/rl-system.init +++ b/scripts/rl-system.init @@ -61,11 +61,6 @@ empty() shopt -s extglob nullglob -clear_serial () { - rm -f /etc/wanpipe/*.conf /etc/ppp/peers/wan* - rm -f /var/run/vyatta/*.description -} - search_config_if_wan () { grep -q "\<serial\>.*\<$1\>" $BOOTFILE } @@ -201,7 +196,6 @@ start () { log_failure_msg "can\'t reset config files" setup_ntp_config_file - clear_serial add_new_serial_if || \ log_failure_msg "can\'t add serial interfaces" |