X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Farchival%2Fsnarf_linux_config.pl;h=c6820ace4f104aa67f1528e77337459806e85cdc;hb=53b84142d889ff4fdf2d135a9c022d50e34ad211;hp=7420c031e00dbf59a64b563c19d2320508d88214;hpb=7ef9f4fdbae698dff9a08189f616564d471abc45;p=feisty_meow.git

diff --git a/scripts/archival/snarf_linux_config.pl b/scripts/archival/snarf_linux_config.pl
index 7420c031..c6820ace 100644
--- a/scripts/archival/snarf_linux_config.pl
+++ b/scripts/archival/snarf_linux_config.pl
@@ -15,16 +15,24 @@
 #  version of the License.  Please send any updates to "fred@gruntose.com".
 ##############
 
-require "importenv.pl";
 require "shared_snarfer.pl";
 
+use Env qw(HOME);
+
+# make sure we are running as root.  otherwise we have no access to look at many things in /etc.
+if ($< != 0) {
+  printf "This script must be run as root or sudo.  Try this:\n";
+  printf "  sudo -E PERLLIB=\$PERLLIB perl \$FEISTY_MEOW_SCRIPTS/archival/snarf_linux_config.pl @ARGV\n";
+  exit 1;
+}
+
 &initialize_snarfer;
 
 # get the number we use and increment it for the next use.
 local($number) = &retrieve_number("aa_backup");
 
 # variables used throughout.
-local($snarf_file_base) = snarf_prefix("linux_config");
+local($snarf_file_base) = snarf_prefix("config-linux");
 local($snarf_file) = &snarf_name($snarf_file_base, $number);
 
 # store the current archive number in the file for retrieval on the
@@ -53,11 +61,13 @@ unlink $infofile;
 &backup_files($snarf_file_base, $number, "/", "var/lib/dpkg", ("status*"));
 
 # backup the crucial hierarchies in /var...
-&backup_hierarchy($snarf_file_base, $number, "/", "var/named");
+#gone: &backup_hierarchy($snarf_file_base, $number, "/", "var/named");
+#gone: &backup_hierarchy($snarf_file_base, $number, "/", "var/lib/named/master");
+
 ###not good: &backup_hierarchy($snarf_file_base, $number, "/", "var/lib/mysql");
 ###the mysql snarf is not necessarily usable, since we really should be
 ###backing up the databases by another means than this.
-&backup_hierarchy($snarf_file_base, $number, "/", "var/lib/named/master");
+
 &backup_hierarchy($snarf_file_base, $number, "/", "var/lib/webalizer");
 
 # snag the grub bootloader files.
@@ -66,16 +76,20 @@ unlink $infofile;
 # now get the entire /etc hierarchy...
 &backup_hierarchy($snarf_file_base, $number, "/", "etc");
 
+# suck in the current state for the resolver.
+&backup_hierarchy($snarf_file_base, $number, "/", "run/resolvconf");
+
 # clean out extra files.
 &remove_from_backup($snarf_file_base, $number, "etc/cups/ppds.dat*");
 &remove_from_backup($snarf_file_base, $number, "etc/httpd/conf/ssl.crt/ca-bundle.crt");
-&remove_from_backup($snarf_file_base, $number, "etc/locale/*");
+&remove_from_backup($snarf_file_base, $number, "etc/locale");
+&remove_from_backup($snarf_file_base, $number, "etc/alternatives");
 &remove_from_backup($snarf_file_base, $number, "etc/opt/kde3/share/services/ksycoca");
-&remove_from_backup($snarf_file_base, $number, "etc/preload.d/*");
+&remove_from_backup($snarf_file_base, $number, "etc/preload.d");
 &remove_from_backup($snarf_file_base, $number, "etc/rmt");
 &remove_from_backup($snarf_file_base, $number, "etc/termcap");
 &remove_from_backup($snarf_file_base, $number, "etc/X11/X");
-&remove_from_backup($snarf_file_base, $number, "etc/X11/xkb/*");
+&remove_from_backup($snarf_file_base, $number, "etc/X11/xkb");
 &remove_from_backup($snarf_file_base, $number, "*.bak");
 &remove_from_backup($snarf_file_base, $number, "*.cache");
 &remove_from_backup($snarf_file_base, $number, "*.crt");