From cdfc1e52a80d3215930364880727a4c5a524433d Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Mon, 1 Oct 2007 17:04:30 +0000 Subject: [PATCH] Alsa stellt nun auch die gespeicherte Lautstaerke wieder her Guardian Paket wurde die fehlende Datei hinzugefuegt Connectd sollte nun die secrets aendern wenn er auf Backup Profile schwenkt git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@933 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/packages/guardian | 1 + src/initscripts/init.d/alsa | 3 ++- src/initscripts/init.d/connectd | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/packages/guardian b/config/rootfiles/packages/guardian index 4564d96bc0..b9487d86b6 100644 --- a/config/rootfiles/packages/guardian +++ b/config/rootfiles/packages/guardian @@ -2,3 +2,4 @@ usr/local/bin/guardian.pl usr/local/bin/guardian_block.sh usr/local/bin/guardian_unblock.sh var/ipfire/guardian/guardian.conf +var/ipfire/guardian/guardian.ignore diff --git a/src/initscripts/init.d/alsa b/src/initscripts/init.d/alsa index 4d54c33f64..5da0b2c8f6 100644 --- a/src/initscripts/init.d/alsa +++ b/src/initscripts/init.d/alsa @@ -11,11 +11,12 @@ case "$1" in start) - boot_mesg "Starting ALSA..." + boot_mesg "Starting ALSA... Restoring volumes..." modprobe snd_pcm_oss >/dev/null 2>&1 || failed=1 modprobe snd_mixer_oss >/dev/null 2>&1 || failed=1 (exit ${failed}) evaluate_retval + loadproc /usr/sbin/alsactl restore ;; stop) boot_mesg "Stopping ALSA... Saving volumes..." diff --git a/src/initscripts/init.d/connectd b/src/initscripts/init.d/connectd index df959e085c..8520b344b5 100644 --- a/src/initscripts/init.d/connectd +++ b/src/initscripts/init.d/connectd @@ -66,6 +66,9 @@ case "$1" in rm -f /var/ipfire/ppp/settings cp "/var/ipfire/ppp/settings-${BACKUPPROFILE}" /var/ipfire/ppp/settings msg_log "Switched to backup profile ${BACKUPPROFILE}" + # to be shure the right secrets are used + eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings-${BACKUPPROFILE}) + echo "'$USERNAME' * '$PASSWORD'" > /var/ipfire/ppp/secrets else msg_log "No backup profile given. Exiting." exit 0 -- 2.39.2