diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 11 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postrm | 2 | ||||
| -rw-r--r-- | sysconf/69-vyatta-net.rules (renamed from sysconf/vyatta-net.rules) | 0 |
4 files changed, 2 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index a25f32cf..0502fcb4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ cfgdir = $(datadir)/vyatta-cfg/templates share_perl5dir = $(datarootdir)/perl5/Vyatta/Login libudevdir = /lib/udev -etcudevdir = /etc/udev +udevrulesdir = /lib/udev/rules.d bin_sudo_usersdir = $(bindir)/sudo-users curverdir = $(sysconfdir)/config-migrate/current netplugupdir = /etc/netplug/linkup.d @@ -85,7 +85,7 @@ sysconf_DATA += sysconf/filecaps sysconf_DATA += sysconf/capability.conf libudev_SCRIPTS = scripts/vyatta_net_name -etcudev_DATA = sysconf/vyatta-net.rules +udevrules_DATA = sysconf/69-vyatta-net.rules curver_DATA = cfg-version/vrrp@1 curver_DATA += cfg-version/system@3 diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 95a1a764..daecb83f 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -25,17 +25,6 @@ if ! grep -q '^tss' /etc/passwd; then adduser --system --group --shell /usr/sbin/nologin --home /var/lib/tpm tss fi -case `grep '^RULES_FILE=' /lib/udev/write_net_rules` in -*z25_persistent-net.rules* ) - vyatta_net_rules=z24_vyatta-net.rules;; -*70-persistent-net.rules* ) - vyatta_net_rules=69-vyatta-net.rules;; -* ) - vyatta_net_rules=21-vyatta-net.rules;; -esac - -ln -sf ../vyatta-net.rules /etc/udev/rules.d/$vyatta_net_rules - if [ "$sysconfdir" != "/etc" ]; then touch /etc/sudoers cp -p /etc/sudoers /etc/sudoers.bak diff --git a/debian/vyatta-cfg-system.postrm b/debian/vyatta-cfg-system.postrm index 5b22f66b..89d919ce 100644 --- a/debian/vyatta-cfg-system.postrm +++ b/debian/vyatta-cfg-system.postrm @@ -1,8 +1,6 @@ #!/bin/bash if [ "$1" = "purge" ]; then - rm -f /etc/udev/rules.d/*vyatta-net.rules - sed -i -e '/### BEGIN VYATTA/,/### END VYATTA/d' /etc/sudoers sed -i -e 'g/^password/d' /etc/pam.d/password fi diff --git a/sysconf/vyatta-net.rules b/sysconf/69-vyatta-net.rules index 9e874381..9e874381 100644 --- a/sysconf/vyatta-net.rules +++ b/sysconf/69-vyatta-net.rules |