diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | debian/vyatta-cfg.postinst.in | 3 | ||||
| -rw-r--r-- | debian/vyatta-cfg.postrm.in | 2 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-router (renamed from etc/init.d/vyatta-ofr) | 6 |
4 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 25003d2..41d37af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ AM_YFLAGS = -d --name-prefix=yy_`basename $* .y`_ AM_LFLAGS = --prefix=yy_`basename $* .l`_ -olex.yy.c completion_SCRIPTS = etc/bash_completion.d/20vyatta-cfg -initd_SCRIPTS = etc/init.d/vyatta-ofr +initd_SCRIPTS = etc/init.d/vyatta-router dhcphook_SCRIPTS = scripts/vyatta-dhclient-hook modprobe_DATA = etc/modprobe.d/no-copybreak.conf diff --git a/debian/vyatta-cfg.postinst.in b/debian/vyatta-cfg.postinst.in index 1efb9b5..48b889d 100644 --- a/debian/vyatta-cfg.postinst.in +++ b/debian/vyatta-cfg.postinst.in @@ -6,8 +6,7 @@ sysconfdir=@sysconfdir@ mkdir -m 0775 -p $sysconfdir/config $prefix/config chgrp vyattacfg $sysconfdir/config $prefix/config 2>/dev/null -update-rc.d vyatta-ofr defaults 90 >/dev/null -# do we want to start vyatta-ofr here in postinst? +update-rc.d vyatta-router defaults 90 >/dev/null if [ "$sysconfdir" != "/etc" ]; then # remove the config files and replace with blank ones diff --git a/debian/vyatta-cfg.postrm.in b/debian/vyatta-cfg.postrm.in index 262b9fe..c211589 100644 --- a/debian/vyatta-cfg.postrm.in +++ b/debian/vyatta-cfg.postrm.in @@ -1,6 +1,6 @@ #!/bin/bash if [ "$1" = "purge" ]; then - update-rc.d vyatta-ofr remove >/dev/null || exit $? + update-rc.d vyatta-router remove >/dev/null || exit $? fi diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-router index a74a87e..5c93faf 100755 --- a/etc/init.d/vyatta-ofr +++ b/etc/init.d/vyatta-router @@ -1,6 +1,6 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: vyatta-ofr +# Provides: vyatta-router # Required-Start: $syslog $time $local_fs # Required-Stop: $syslog $time $local_fs # Default-Start: 2 3 4 5 @@ -82,7 +82,7 @@ init_bootfile () { fi [ -d /media/floppy/config ] && - mount -o bind /media/floppy/config /opt/vyatta/etc/config + mount -o bind /media/floppy/config /opt/vyatta/etc/config if [ -f $BOOTFILE ] && grep -q '/\*XORP Configuration File, v1.0\*/' \ $BOOTFILE >&/dev/null; then @@ -138,7 +138,7 @@ cleanup_raid() # # Load the acpi_cpufreq kernel module, but only for certain processors. -# Some Intel CPUs need to have it loaded in order to initialize +# Some Intel CPUs need to have it loaded in order to initialize # properly. # load_acpi_cpufreq() |