diff -Nru friendly-recovery-0.2.24/debian/changelog friendly-recovery-0.2.25/debian/changelog --- friendly-recovery-0.2.24/debian/changelog 2012-02-16 17:10:24.000000000 +0000 +++ friendly-recovery-0.2.25/debian/changelog 2012-03-14 13:57:11.000000000 +0000 @@ -1,3 +1,15 @@ +friendly-recovery (0.2.25) precise; urgency=low + + [ James Hunt ] + * README: Fixed typo. + * lib/recovery-mode/options/system-symmary: added brief LVM and APT + summaries. + + [ Stéphane Graber ] + * Update upstart job to ensure /run/shm and /run/lock are present. + + -- Stéphane Graber Wed, 14 Mar 2012 09:57:09 -0400 + friendly-recovery (0.2.24) precise; urgency=low * Fix failsafeX (thanks to James Hunt) diff -Nru friendly-recovery-0.2.24/debian/friendly-recovery.upstart friendly-recovery-0.2.25/debian/friendly-recovery.upstart --- friendly-recovery-0.2.24/debian/friendly-recovery.upstart 2012-02-01 22:04:17.000000000 +0000 +++ friendly-recovery-0.2.25/debian/friendly-recovery.upstart 2012-03-14 13:56:14.000000000 +0000 @@ -19,6 +19,10 @@ start console-setup || true start setvtrgb || true + # Make sure /run contains the required directories for the + # recovery menu options + mkdir -p /run/lock /run/shm || true + # Emit the mounted event to trigger resolvconf and mounted-run initctl emit mounted MOUNTPOINT=/run || true diff -Nru friendly-recovery-0.2.24/lib/recovery-mode/options/system-summary friendly-recovery-0.2.25/lib/recovery-mode/options/system-summary --- friendly-recovery-0.2.24/lib/recovery-mode/options/system-summary 2012-02-16 17:42:02.000000000 +0000 +++ friendly-recovery-0.2.25/lib/recovery-mode/options/system-summary 2012-03-08 19:38:12.000000000 +0000 @@ -36,7 +36,51 @@ raid_state=$(eval_gettext 'No software RAID detected (mdstat)') fi -msg="$(eval_gettext '=== General information ===') +# LVM +if [ -z "$(which vgscan)" ] +then + lvm_state=$(eval_gettext 'No LVM detected (vgscan)') +else + if [ "$(id -u)" -ne 0 ] + then + lvm_state=$(eval_gettext 'Unknown (must be run as root)') + else + lvm_state="$(eval_gettext 'Physical Volumes:')" + pvck >/dev/null 2>&1 + if [ $? -eq 0 ]; then + lvm_state="$lvm_state $(eval_gettext 'ok (good)')" + else + lvm_state="$lvm_state $(eval_gettext 'not ok (BAD)')" + fi + + lvm_state="$lvm_state +$(eval_gettext 'Volume Groups:')" + vgck >/dev/null 2>&1 + if [ $? -eq 0 ]; then + lvm_state="$lvm_state $(eval_gettext 'ok (good)')" + else + lvm_state="$lvm_state $(eval_gettext 'not ok (BAD)')" + fi + fi +fi + +# Get package system information +if [ "$READONLY" = "true" ]; then + apt_state=$(eval_gettext 'unknown (read-only filesystem)') +elif [ "$(id -u)" -ne 0 ]; then + apt_state=$(eval_gettext 'unknown (must be run as root)') +else + apt-get -qq --no-act check + if [ $? -eq 0 ]; then + apt_state=$(eval_gettext 'yes (good)') + else + apt_state=$(eval_gettext 'no (BAD)') + fi +fi + +msg="$(eval_gettext '(Use arrows/PageUp/PageDown keys to scroll and TAB key to select)') + +$(eval_gettext '=== General information ===') $(eval_gettext 'System mode:') $fs_state $(eval_gettext 'CPU information:') $cpu_info $(eval_gettext 'Network connectivity:') $net_state @@ -47,11 +91,17 @@ $(eval_gettext '=== Software RAID state ===') $raid_state +$(eval_gettext '=== LVM state ===') +$lvm_state + $(eval_gettext '=== Detailed memory usage ===') $(free -m) $(eval_gettext '=== Detailed network configuration ===') $(ifconfig) + +$(eval_gettext '=== System database (APT) ===') +$(eval_gettext 'Database is consistent:') $apt_state " whiptail --scrolltext --msgbox "$msg" 21 80 --title $(eval_gettext "System summary") diff -Nru friendly-recovery-0.2.24/po/de.po friendly-recovery-0.2.25/po/de.po --- friendly-recovery-0.2.24/po/de.po 2012-02-16 17:08:26.000000000 +0000 +++ friendly-recovery-0.2.25/po/de.po 2012-03-08 19:38:28.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-16 12:08-0500\n" +"POT-Creation-Date: 2012-03-08 14:38-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -76,7 +76,7 @@ msgstr "" #: ../lib/recovery-mode/options/system-summary:9 -#: ../lib/recovery-mode/options/system-summary:57 +#: ../lib/recovery-mode/options/system-summary:107 #, sh-format msgid "System summary" msgstr "" @@ -111,46 +111,118 @@ msgid "No software RAID detected (mdstat)" msgstr "" -#: ../lib/recovery-mode/options/system-summary:39 +#: ../lib/recovery-mode/options/system-summary:42 +#, sh-format +msgid "No LVM detected (vgscan)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:46 +#, sh-format +msgid "Unknown (must be run as root)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:48 +#, sh-format +msgid "Physical Volumes:" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:51 +#: ../lib/recovery-mode/options/system-summary:60 +#, sh-format +msgid "ok (good)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:53 +#: ../lib/recovery-mode/options/system-summary:62 +#, sh-format +msgid "not ok (BAD)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:57 +#, sh-format +msgid "Volume Groups:" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:69 +#, sh-format +msgid "unknown (read-only filesystem)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:71 +#, sh-format +msgid "unknown (must be run as root)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:75 +#, sh-format +msgid "yes (good)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:77 +#, sh-format +msgid "no (BAD)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:81 +#, sh-format +msgid "(Use arrows/PageUp/PageDown keys to scroll and TAB key to select)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:83 #, sh-format msgid "=== General information ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:40 +#: ../lib/recovery-mode/options/system-summary:84 #, sh-format msgid "System mode:" msgstr "" -#: ../lib/recovery-mode/options/system-summary:41 +#: ../lib/recovery-mode/options/system-summary:85 #, sh-format msgid "CPU information:" msgstr "" -#: ../lib/recovery-mode/options/system-summary:42 +#: ../lib/recovery-mode/options/system-summary:86 #, sh-format msgid "Network connectivity:" msgstr "" -#: ../lib/recovery-mode/options/system-summary:44 +#: ../lib/recovery-mode/options/system-summary:88 #, sh-format msgid "=== Detailed disk usage ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:47 +#: ../lib/recovery-mode/options/system-summary:91 #, sh-format msgid "=== Software RAID state ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:50 +#: ../lib/recovery-mode/options/system-summary:94 +#, sh-format +msgid "=== LVM state ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:97 #, sh-format msgid "=== Detailed memory usage ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:53 +#: ../lib/recovery-mode/options/system-summary:100 #, sh-format msgid "=== Detailed network configuration ===" msgstr "" +#: ../lib/recovery-mode/options/system-summary:103 +#, sh-format +msgid "=== System database (APT) ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:104 +#, sh-format +msgid "Database is consistent:" +msgstr "" + #: ../lib/recovery-mode/recovery-menu:20 #, sh-format msgid "Recovery Menu (filesystem state: read-only)" diff -Nru friendly-recovery-0.2.24/po/friendly-recovery.pot friendly-recovery-0.2.25/po/friendly-recovery.pot --- friendly-recovery-0.2.24/po/friendly-recovery.pot 2012-02-16 17:08:18.000000000 +0000 +++ friendly-recovery-0.2.25/po/friendly-recovery.pot 2012-03-08 19:38:23.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-16 12:08-0500\n" +"POT-Creation-Date: 2012-03-08 14:38-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -76,7 +76,7 @@ msgstr "" #: ../lib/recovery-mode/options/system-summary:9 -#: ../lib/recovery-mode/options/system-summary:57 +#: ../lib/recovery-mode/options/system-summary:107 #, sh-format msgid "System summary" msgstr "" @@ -111,46 +111,118 @@ msgid "No software RAID detected (mdstat)" msgstr "" -#: ../lib/recovery-mode/options/system-summary:39 +#: ../lib/recovery-mode/options/system-summary:42 +#, sh-format +msgid "No LVM detected (vgscan)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:46 +#, sh-format +msgid "Unknown (must be run as root)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:48 +#, sh-format +msgid "Physical Volumes:" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:51 +#: ../lib/recovery-mode/options/system-summary:60 +#, sh-format +msgid "ok (good)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:53 +#: ../lib/recovery-mode/options/system-summary:62 +#, sh-format +msgid "not ok (BAD)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:57 +#, sh-format +msgid "Volume Groups:" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:69 +#, sh-format +msgid "unknown (read-only filesystem)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:71 +#, sh-format +msgid "unknown (must be run as root)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:75 +#, sh-format +msgid "yes (good)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:77 +#, sh-format +msgid "no (BAD)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:81 +#, sh-format +msgid "(Use arrows/PageUp/PageDown keys to scroll and TAB key to select)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:83 #, sh-format msgid "=== General information ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:40 +#: ../lib/recovery-mode/options/system-summary:84 #, sh-format msgid "System mode:" msgstr "" -#: ../lib/recovery-mode/options/system-summary:41 +#: ../lib/recovery-mode/options/system-summary:85 #, sh-format msgid "CPU information:" msgstr "" -#: ../lib/recovery-mode/options/system-summary:42 +#: ../lib/recovery-mode/options/system-summary:86 #, sh-format msgid "Network connectivity:" msgstr "" -#: ../lib/recovery-mode/options/system-summary:44 +#: ../lib/recovery-mode/options/system-summary:88 #, sh-format msgid "=== Detailed disk usage ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:47 +#: ../lib/recovery-mode/options/system-summary:91 #, sh-format msgid "=== Software RAID state ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:50 +#: ../lib/recovery-mode/options/system-summary:94 +#, sh-format +msgid "=== LVM state ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:97 #, sh-format msgid "=== Detailed memory usage ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:53 +#: ../lib/recovery-mode/options/system-summary:100 #, sh-format msgid "=== Detailed network configuration ===" msgstr "" +#: ../lib/recovery-mode/options/system-summary:103 +#, sh-format +msgid "=== System database (APT) ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:104 +#, sh-format +msgid "Database is consistent:" +msgstr "" + #: ../lib/recovery-mode/recovery-menu:20 #, sh-format msgid "Recovery Menu (filesystem state: read-only)" diff -Nru friendly-recovery-0.2.24/README friendly-recovery-0.2.25/README --- friendly-recovery-0.2.24/README 2012-01-25 03:38:43.000000000 +0000 +++ friendly-recovery-0.2.25/README 2012-03-08 19:33:12.000000000 +0000 @@ -12,5 +12,5 @@ reovery-menu * if the script is run with no parameters it should perform its action -* when the script is done, the menu is build again +* when the script is done, the menu is built again