diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/blkid.tab /etc/blkid.tab
--- /mnt/oldroot/etc/blkid.tab 1969-12-31 16:00:00.000000000 -0800
+++ /etc/blkid.tab 2012-08-23 22:41:29.059465764 -0700
@@ -0,0 +1,17 @@
+/dev/sda1
+/dev/sda2
+/dev/sda5
+/dev/sdb1
+/dev/sdb10
+/dev/sdb3
+/dev/sdb5
+/dev/sdb6
+/dev/sdb7
+/dev/sdb8
+/dev/sdb9
+/dev/sda6
+/dev/sda7
+/dev/sda8
+/dev/sdb11
+/dev/sdb12
+/dev/sr0
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/blkid.tab.old /etc/blkid.tab.old
--- /mnt/oldroot/etc/blkid.tab.old 2012-08-17 08:57:47.031584926 -0700
+++ /etc/blkid.tab.old 2012-08-23 22:41:28.840465764 -0700
@@ -1,16 +1,17 @@
-/dev/sda1
-/dev/sda5
-/dev/sda7
-/dev/sda8
-/dev/sda6
-/dev/sda2
-/dev/sdb1
-/dev/sdb3
-/dev/sdb7
-/dev/sdb5
-/dev/sdb6
-/dev/sdb9
-/dev/sdb10
-/dev/sdb8
-/dev/sdd
-/dev/sdd1
+/dev/sda1
+/dev/sda2
+/dev/sda5
+/dev/sdb1
+/dev/sdb10
+/dev/sdb3
+/dev/sdb5
+/dev/sdb6
+/dev/sdb7
+/dev/sdb8
+/dev/sdb9
+/dev/sda6
+/dev/sda7
+/dev/sda8
+/dev/sdb11
+/dev/sdb12
+/dev/sr0
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/calculate/calculate2.env /etc/calculate/calculate2.env
--- /mnt/oldroot/etc/calculate/calculate2.env 2012-07-29 23:40:56.981530274 -0700
+++ /etc/calculate/calculate2.env 2012-08-23 22:41:38.291465770 -0700
@@ -13,6 +13,7 @@
# Set auto-update configuration files.
cl_autoupdate_set = off
# keep value of root dev uuid (8 char) for kernel symlink
-cl_kernel_uid = 07e27d1f
+cl_kernel_uid = 9a129fda
# current linux build
-os_linux_build = 20120726
+os_linux_build = 20120817
+cl_merges = calculate-desktop,calculate-client
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/calculate/calculate3.env /etc/calculate/calculate3.env
--- /mnt/oldroot/etc/calculate/calculate3.env 2012-07-29 23:46:15.721000004 -0700
+++ /etc/calculate/calculate3.env 2012-08-23 20:46:39.031000087 -0700
@@ -12,8 +12,8 @@
# Set auto-update configuration files.
cl_autoupdate_set = off
# keep value of root dev uuid (8 char) for kernel symlink
-cl_kernel_uid = 07e27d1f
+cl_kernel_uid = 9a129fda
# current linux build
-os_linux_build = 20120726
+os_linux_build = 20120817
cl_wsdl = calculate-install
cl_merges = calculate-install
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/conf.d/consolefont /etc/conf.d/consolefont
--- /mnt/oldroot/etc/conf.d/consolefont 2012-07-29 23:40:51.205530272 -0700
+++ /etc/conf.d/consolefont 2012-08-23 22:41:32.508465766 -0700
@@ -10,7 +10,7 @@
# To use the default console font, comment out the CONSOLEFONT setting below.
# This setting is used by the /etc/init.d/consolefont script (NOTE: if you do
# not want to use it, run "rc-update del consolefont boot" as root).
-consolefont="LatArCyrHeb-16"
+consolefont="ter-k14n"
# consoletranslation is the charset map file to use. Leave commented to use
# the default one. Have a look in /usr/share/consoletrans for a selection of
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/conf.d/hostname /etc/conf.d/hostname
--- /mnt/oldroot/etc/conf.d/hostname 2012-07-29 23:40:51.218530271 -0700
+++ /etc/conf.d/hostname 2012-08-23 22:41:32.519465766 -0700
@@ -5,4 +5,4 @@
# For modify this file, create /etc/conf.d/hostname.clt template.
#------------------------------------------------------------------------------
# Set to the hostname of this machine
-hostname="....."
+hostname="calculate"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/conf.d/keymaps /etc/conf.d/keymaps
--- /mnt/oldroot/etc/conf.d/keymaps 2012-07-29 23:40:51.301530272 -0700
+++ /etc/conf.d/keymaps 2012-08-23 22:41:32.611465766 -0700
@@ -6,7 +6,7 @@
#------------------------------------------------------------------------------
# Use keymap to specify the default console keymap. There is a complete tree
# of keymaps in /usr/share/keymaps to choose from.
-keymap="us"
+keymap="-u ruwin_cplk-UTF-8"
# Should we first load the 'windowkeys' console keymap? Most x86 users will
# say "yes" here. Note that non-x86 users should leave it as "no".
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/conf.d/modules /etc/conf.d/modules
--- /mnt/oldroot/etc/conf.d/modules 2012-07-29 23:46:41.993000019 -0700
+++ /etc/conf.d/modules 2012-08-23 22:41:32.639465766 -0700
@@ -1,3 +1,9 @@
+#------------------------------------------------------------------------------
+# Modified Calculate-install 3.0.0
+# Processed template files:
+# /var/lib/layman/calculate/profiles/templates/install-3.0/1live/openrc/conf.d/modules
+# For modify this file, create /etc/conf.d/modules.clt template.
+#------------------------------------------------------------------------------
# You can define a list modules for a specific kernel version,
# a released kernel version, a main kernel version or just a list.
# The most specific versioned variable will take precedence.
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/conf.d/timidity /etc/conf.d/timidity
--- /mnt/oldroot/etc/conf.d/timidity 2012-08-08 22:50:37.000000000 -0700
+++ /etc/conf.d/timidity 1969-12-31 16:00:00.000000000 -0800
@@ -1,27 +0,0 @@
-# TIMIDITY_OPTS
-# Command line arguements to be passed to timidity. -iA is always used
-# Common options:
-# -Os : Output to ALSA pcm device
-# -Oe : Output to esd
-# -On : Output to NAS
-#
-# -B, : Set number of buffer fragments(n), and buffer size(2^m)
-#
-# -EFreverb=0 : Disable MIDI reverb effect control
-# -EFreverb=1[,level] : Enable MIDI reverb effect control
-# `level' is optional to specify reverb level [0..127]
-# This effect is only available in stereo
-# (default)
-# -EFreverb=2 : Global reverb effect
-
-TIMIDITY_OPTS="-B2,8 -Os -EFreverb=0"
-
-# TIMIDITY_PCM_NAME
-# This option can be used to choose an alternate ALSA pcm device. This will
-# be most useful for users of the dmix alsa plugin or those with multiple
-# cards. If you don't know what this is, chances are you want the default.
-
-#TIMIDITY_PCM_NAME="default"
-
-#LADSPA plugins library path
-LADSPA_PATH="/usr/lib/ladspa"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/config-archive/etc/portage/package.keywords/custom /etc/config-archive/etc/portage/package.keywords/custom
--- /mnt/oldroot/etc/config-archive/etc/portage/package.keywords/custom 2012-08-08 22:36:24.506000000 -0700
+++ /etc/config-archive/etc/portage/package.keywords/custom 1969-12-31 16:00:00.000000000 -0800
@@ -1,4 +0,0 @@
-#required by =www-client/firefox-14.0.1 (argument)
-=www-client/firefox-14.0.1 ~amd64
-#required by =games-engines/stratagus-2.2.6-r1 (argument)
-=games-engines/stratagus-2.2.6-r1 ~amd64
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/config-archive/etc/portage/package.keywords/custom.1 /etc/config-archive/etc/portage/package.keywords/custom.1
--- /mnt/oldroot/etc/config-archive/etc/portage/package.keywords/custom.1 2012-07-30 08:51:24.109357000 -0700
+++ /etc/config-archive/etc/portage/package.keywords/custom.1 1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-#required by =www-client/firefox-14.0.1 (argument)
-=www-client/firefox-14.0.1 ~amd64
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/config-archive/etc/portage/package.keywords/custom.dist /etc/config-archive/etc/portage/package.keywords/custom.dist
--- /mnt/oldroot/etc/config-archive/etc/portage/package.keywords/custom.dist 2012-08-08 22:44:15.408643000 -0700
+++ /etc/config-archive/etc/portage/package.keywords/custom.dist 1969-12-31 16:00:00.000000000 -0800
@@ -1,8 +0,0 @@
-#required by =www-client/firefox-14.0.1 (argument)
-=www-client/firefox-14.0.1 ~amd64
-#required by =games-engines/stratagus-2.2.6-r1 (argument)
-=games-engines/stratagus-2.2.6-r1 ~amd64
-#required by games-strategy/wargus-data-0, required by =games-strategy/wargus-data-0 (argument)
-=games-strategy/wargus-2.2.6-r2 ~amd64
-#required by =games-strategy/wargus-data-0 (argument)
-=games-strategy/wargus-data-0 ~amd64
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/config-archive/etc/portage/package.use/custom.dist /etc/config-archive/etc/portage/package.use/custom.dist
--- /mnt/oldroot/etc/config-archive/etc/portage/package.use/custom.dist 2012-08-05 23:07:37.019217000 -0700
+++ /etc/config-archive/etc/portage/package.use/custom.dist 1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-#required by games-strategy/freecraft-1.18-r3, required by =games-strategy/freecraft-1.18-r3 (argument)
-=sys-apps/util-linux-2.20.1-r2 ddate
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/csh.env /etc/csh.env
--- /mnt/oldroot/etc/csh.env 2012-08-16 22:54:04.207993398 -0700
+++ /etc/csh.env 2012-08-25 13:02:41.347000607 -0700
@@ -8,22 +8,21 @@
setenv GCC_SPECS ''
setenv GDK_USE_XFT '1'
setenv GUILE_LOAD_PATH '/usr/share/guile/1.8'
-setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
+setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
setenv KDE_IS_PRELINKED '1'
setenv LANG 'ru_RU.UTF-8'
setenv LC_NUMERIC 'POSIX'
setenv LESS '-R -M --shift 5'
setenv LESSOPEN '|lesspipe %s'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man'
setenv OPENGL_PROFILE 'xorg-x11'
-setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/games/bin'
+setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4'
setenv PRELINK_PATH_MASK '/usr/lib64/klibc:/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib64/gimp/2.0/plug-ins/hot:/opt/bin/skype'
setenv QT_GRAPHICSSYSTEM 'raster'
setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins'
-setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3'
+setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4'
setenv SANE_CONFIG_DIR '/etc/sane.d'
setenv USB_DEVFS_PATH '/dev/bus/usb'
-setenv VBOX_APP_HOME '/usr/lib64/virtualbox'
setenv XDG_CONFIG_DIRS '/etc/xdg'
setenv XDG_DATA_DIRS '/usr/local/share:/usr/share'
setenv XSESSION 'KDE-4'
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/cups/classes.conf /etc/cups/classes.conf
--- /mnt/oldroot/etc/cups/classes.conf 2012-07-30 16:16:31.750320129 -0700
+++ /etc/cups/classes.conf 2012-08-24 18:45:06.169733874 -0700
@@ -1,3 +1,3 @@
# Class configuration file for CUPS v1.5.3
-# Written by cupsd on 2012-07-30 16:16
+# Written by cupsd on 2012-08-24 18:45
# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/cups/ppd/Canon_MP530.ppd /etc/cups/ppd/Canon_MP530.ppd
--- /mnt/oldroot/etc/cups/ppd/Canon_MP530.ppd 2012-07-30 16:16:00.035320137 -0700
+++ /etc/cups/ppd/Canon_MP530.ppd 2012-08-24 18:44:12.178733843 -0700
@@ -451,7 +451,7 @@
*OpenUI *StpColorPrecision/Color Precision: PickOne
*OPOptionHints StpColorPrecision: "radiobuttons"
*OrderDependency: 1 AnySetup *StpColorPrecision
-*DefaultStpColorPrecision: Best
+*DefaultStpColorPrecision: Normal
*StpDefaultStpColorPrecision: Normal
*StpColorPrecision Normal/Normal: "<>setpagedevice"
*StpColorPrecision Best/Best: "<>setpagedevice"
@@ -500,7 +500,7 @@
*OPOptionHints Quality: "dropdown"
*OrderDependency: 10 AnySetup *StpQuality
*StpStpQuality: 0 1 0 0 255 0.000 0.000 0.000
-*DefaultStpQuality: None
+*DefaultStpQuality: Standard
*StpDefaultStpQuality: Standard
*StpQuality None/Manual Control: "<>setpagedevice"
*StpQuality Standard/Standard: "<>setpagedevice"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/cups/printers.conf /etc/cups/printers.conf
--- /mnt/oldroot/etc/cups/printers.conf 2012-08-10 21:48:22.130470329 -0700
+++ /etc/cups/printers.conf 2012-08-24 18:45:06.169733874 -0700
@@ -1,14 +1,14 @@
# Printer configuration file for CUPS v1.5.3
-# Written by cupsd on 2012-08-10 21:48
+# Written by cupsd on 2012-08-24 18:45
# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-UUID urn:uuid:a93c0caa-66ab-363f-6ae0-e179c6a04eb3
-Info color inkjet 2-sided
-Location parent's room
+UUID urn:uuid:ae147078-2114-3ee7-7fcb-325b28fdb2c9
+Info multifunction
+Location mainroot
MakeModel Canon PIXMA MP530 - CUPS+Gutenprint v5.2.9
DeviceURI usb://Canon/MP530?serial=111CBE&interface=1
State Idle
-StateTime 1344660476
+StateTime 1345859028
Type 36876
Accepting Yes
Shared Yes
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/cups/printers.conf.O /etc/cups/printers.conf.O
--- /mnt/oldroot/etc/cups/printers.conf.O 2012-07-30 16:19:22.205320247 -0700
+++ /etc/cups/printers.conf.O 2012-08-24 18:44:18.524733847 -0700
@@ -1,14 +1,14 @@
# Printer configuration file for CUPS v1.5.3
-# Written by cupsd on 2012-07-30 16:19
+# Written by cupsd on 2012-08-24 18:44
# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-
-UUID urn:uuid:a93c0caa-66ab-363f-6ae0-e179c6a04eb3
-Info color inkjet 2-sided
-Location parent's room
+
+UUID urn:uuid:ae147078-2114-3ee7-7fcb-325b28fdb2c9
+Info multifunction
+Location mainroot
MakeModel Canon PIXMA MP530 - CUPS+Gutenprint v5.2.9
DeviceURI usb://Canon/MP530?serial=111CBE&interface=1
State Idle
-StateTime 1343689943
+StateTime 1345859028
Type 36876
Accepting Yes
Shared Yes
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/cups/subscriptions.conf /etc/cups/subscriptions.conf
--- /mnt/oldroot/etc/cups/subscriptions.conf 2012-08-17 07:52:48.579000064 -0700
+++ /etc/cups/subscriptions.conf 2012-08-25 13:27:21.754121557 -0700
@@ -1,51 +1,19 @@
# Subscription configuration file for CUPS v1.5.3
-# Written by cupsd on 2012-08-17 07:52
-NextSubscriptionId 59
-
+# Written by cupsd on 2012-08-25 13:27
+NextSubscriptionId 7
+
Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
Owner fean
LeaseDuration 86400
Interval 0
-ExpirationTime 1345232174
+ExpirationTime 1345993307
NextEventId 1
-
+
Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
Owner fean
LeaseDuration 86400
Interval 0
-ExpirationTime 1345235988
-NextEventId 1
-
-
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner fean
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1345239185
-NextEventId 1
-
-
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner fean
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1345269945
-NextEventId 1
-
-
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner fean
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1345270732
-NextEventId 1
-
-
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner fean
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1345301537
+ExpirationTime 1346011393
NextEventId 1
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/cups/subscriptions.conf.O /etc/cups/subscriptions.conf.O
--- /mnt/oldroot/etc/cups/subscriptions.conf.O 2012-08-17 07:52:01.390000033 -0700
+++ /etc/cups/subscriptions.conf.O 2012-08-25 13:03:44.619001696 -0700
@@ -1,43 +1,27 @@
# Subscription configuration file for CUPS v1.5.3
-# Written by cupsd on 2012-08-17 07:52
-NextSubscriptionId 58
-
+# Written by cupsd on 2012-08-25 13:03
+NextSubscriptionId 7
+
Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
Owner fean
LeaseDuration 86400
Interval 0
-ExpirationTime 1345232174
-NextEventId 1
-
-
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner fean
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1345235988
-NextEventId 1
-
-
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner fean
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1345239185
-NextEventId 1
+ExpirationTime 1345926409
+NextEventId 5
-
+
Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
Owner fean
LeaseDuration 86400
Interval 0
-ExpirationTime 1345269945
+ExpirationTime 1345993307
NextEventId 1
-
+
Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
Owner fean
LeaseDuration 86400
Interval 0
-ExpirationTime 1345270732
+ExpirationTime 1346011393
NextEventId 1
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/default/grub /etc/default/grub
--- /mnt/oldroot/etc/default/grub 2012-07-29 23:40:18.731530254 -0700
+++ /etc/default/grub 2012-08-23 22:41:03.902465751 -0700
@@ -19,7 +19,7 @@
GRUB_TIMEOUT=2
GRUB_CMDLINE_LINUX_DEFAULT=""
-GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,1280x1024-32,mtrr:3,splash=silent,theme:calculate real_resume=/dev/sdc3 elevator=cfq doscsi calculate=video:radeon console=tty1 udev quiet"
+GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,1280x1024-32,mtrr:3,splash=silent,theme:calculate elevator=cfq doscsi calculate=video:radeon console=tty1 udev quiet"
# Uncomment to disable graphical terminal (grub-pc only)
#GRUB_TERMINAL=console
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/DIR_COLORS /etc/DIR_COLORS
--- /mnt/oldroot/etc/DIR_COLORS 2012-01-08 12:29:34.000000000 -0800
+++ /etc/DIR_COLORS 2012-08-19 03:51:18.000000000 -0700
@@ -1,7 +1,7 @@
# Configuration file for dircolors, a utility to help you set the
# LS_COLORS environment variable used by GNU ls with the --color option.
-# Copyright (C) 1996, 1999-2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# Copying and distribution of this file, with or without modification,
# are permitted provided the copyright notice and this notice are preserved.
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/eix-sync.conf /etc/eix-sync.conf
--- /mnt/oldroot/etc/eix-sync.conf 2012-08-05 23:13:40.000000000 -0700
+++ /etc/eix-sync.conf 2012-08-23 22:41:36.737465770 -0700
@@ -5,5 +5,6 @@
# For modify this file, create /etc/eix-sync.conf.clt template.
#------------------------------------------------------------------------------
*
+![ -x /usr/bin/eix-checkout ] && /usr/bin/eix-checkout || true
@egencache --repo=calculate --update --jobs=4
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/env.d/04gcc-x86_64-pc-linux-gnu /etc/env.d/04gcc-x86_64-pc-linux-gnu
--- /mnt/oldroot/etc/env.d/04gcc-x86_64-pc-linux-gnu 2012-06-04 05:05:01.000000000 -0700
+++ /etc/env.d/04gcc-x86_64-pc-linux-gnu 2012-08-23 22:37:38.173465637 -0700
@@ -1,5 +1,5 @@
-PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
+PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4"
+ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4"
GCC_SPECS=""
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info"
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/env.d/90games /etc/env.d/90games
--- /mnt/oldroot/etc/env.d/90games 2012-08-08 22:51:14.327326229 -0700
+++ /etc/env.d/90games 1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-LDPATH="/usr/games/lib64:/usr/games/lib32:/usr/games/lib"
-PATH="/usr/games/bin"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/env.d/90virtualbox /etc/env.d/90virtualbox
--- /mnt/oldroot/etc/env.d/90virtualbox 2012-08-13 13:03:41.000000000 -0700
+++ /etc/env.d/90virtualbox 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-VBOX_APP_HOME=/usr/lib64/virtualbox
\ В конце файла нет новой строки
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/env.d/gcc/config-x86_64-pc-linux-gnu /etc/env.d/gcc/config-x86_64-pc-linux-gnu
--- /mnt/oldroot/etc/env.d/gcc/config-x86_64-pc-linux-gnu 2012-08-05 23:12:46.602217371 -0700
+++ /etc/env.d/gcc/config-x86_64-pc-linux-gnu 2012-08-23 22:37:40.298465637 -0700
@@ -1 +1 @@
-CURRENT=x86_64-pc-linux-gnu-4.5.3
+CURRENT=x86_64-pc-linux-gnu-4.5.4
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/env.d/gcc/.NATIVE /etc/env.d/gcc/.NATIVE
--- /mnt/oldroot/etc/env.d/gcc/.NATIVE 2012-03-03 13:51:19.000000000 -0800
+++ /etc/env.d/gcc/.NATIVE 2012-08-21 14:54:01.000000000 -0700
@@ -1,5 +1,5 @@
-LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32"
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info"
+LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4:/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4/32"
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info"
STDCXX_INCDIR="g++-v4"
-GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
+GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/env.d/gcc/x86_64-pc-linux-gnu-4.5.3 /etc/env.d/gcc/x86_64-pc-linux-gnu-4.5.3
--- /mnt/oldroot/etc/env.d/gcc/x86_64-pc-linux-gnu-4.5.3 2012-03-03 13:51:19.000000000 -0800
+++ /etc/env.d/gcc/x86_64-pc-linux-gnu-4.5.3 1969-12-31 16:00:00.000000000 -0800
@@ -1,5 +0,0 @@
-LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32"
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info"
-STDCXX_INCDIR="g++-v4"
-GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 /etc/env.d/gcc/x86_64-pc-linux-gnu-4.5.4
--- /mnt/oldroot/etc/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 1969-12-31 16:00:00.000000000 -0800
+++ /etc/env.d/gcc/x86_64-pc-linux-gnu-4.5.4 2012-08-21 14:54:01.000000000 -0700
@@ -0,0 +1,5 @@
+LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4:/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4/32"
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info"
+STDCXX_INCDIR="g++-v4"
+GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/fonts/conf.avail/59-google-droid-sans.conf /etc/fonts/conf.avail/59-google-droid-sans.conf
--- /mnt/oldroot/etc/fonts/conf.avail/59-google-droid-sans.conf 1969-12-31 16:00:00.000000000 -0800
+++ /etc/fonts/conf.avail/59-google-droid-sans.conf 2012-08-20 04:27:29.000000000 -0700
@@ -0,0 +1,152 @@
+
+
+
+
+
+ Droid Sans
+
+
+ 7
+
+
+
+
+ Droid Sans Hebrew
+
+
+ Droid Sans
+
+
+ Droid Sans
+
+
+ 6
+
+
+
+
+ Droid Sans Arabic
+
+
+ Droid Sans
+
+
+ Droid Sans
+
+
+ 5
+
+
+
+
+ Droid Sans Thai
+
+
+ Droid Sans
+
+
+ Droid Sans
+
+
+ 4
+
+
+
+
+ zh-cn
+ zh-sg
+ zh-hk
+ zh-tw
+ zh
+
+
+ Droid Sans Japanese
+
+
+ Droid Sans
+
+
+ Droid Sans
+
+
+ 3
+
+
+
+
+ Droid Sans Fallback
+
+
+ Droid Sans
+
+
+ Droid Sans
+
+
+ 2
+
+
+
+
+ zh-cn
+ zh-sg
+ zh-hk
+ zh-tw
+ zh
+
+
+ Droid Sans Japanese
+
+
+ Droid Sans
+
+
+ Droid Sans
+
+
+ 1
+
+
+
+ Droid Sans Arabic
+
+ Droid Sans
+
+
+
+ Droid Sans Hebrew
+
+ Droid Sans
+
+
+
+ Droid Sans Japanese
+
+ Droid Sans
+
+
+
+ Droid Sans Thai
+
+ Droid Sans
+
+
+
+ Droid Sans Fallback
+
+ Droid Sans
+
+
+
+ sans-serif
+
+ Droid Sans
+
+
+
+ Droid Sans
+
+ sans-serif
+
+
+
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/fonts/conf.avail/59-google-droid-sans-mono.conf /etc/fonts/conf.avail/59-google-droid-sans-mono.conf
--- /mnt/oldroot/etc/fonts/conf.avail/59-google-droid-sans-mono.conf 1969-12-31 16:00:00.000000000 -0800
+++ /etc/fonts/conf.avail/59-google-droid-sans-mono.conf 2012-08-20 04:27:29.000000000 -0700
@@ -0,0 +1,16 @@
+
+
+
+
+ monospace
+
+ Droid Sans Mono
+
+
+
+ Droid Sans Mono
+
+ monospace
+
+
+
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/fonts/conf.avail/59-google-droid-serif.conf /etc/fonts/conf.avail/59-google-droid-serif.conf
--- /mnt/oldroot/etc/fonts/conf.avail/59-google-droid-serif.conf 1969-12-31 16:00:00.000000000 -0800
+++ /etc/fonts/conf.avail/59-google-droid-serif.conf 2012-08-20 04:27:29.000000000 -0700
@@ -0,0 +1,16 @@
+
+
+
+
+ serif
+
+ Droid Serif
+
+
+
+ Droid Serif
+
+ serif
+
+
+
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/fstab /etc/fstab
--- /mnt/oldroot/etc/fstab 2012-08-23 10:44:50.781000113 -0700
+++ /etc/fstab 2012-08-23 20:48:16.275005093 -0700
@@ -1,7 +1,15 @@
-proc /proc proc defaults 0 0
-shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
+#------------------------------------------------------------------------------
+# Modified Calculate-install 3.0.0
+# Processed template files:
+# /var/lib/layman/calculate/profiles/templates/install-3.0/1system/baselayout/fstab
+# For modify this file, create /etc/fstab.clt template.
+#------------------------------------------------------------------------------
+/dev/sdb12 / ext4 noatime 0 2
+/dev/sda6 /boot ext4 noatime 0 0
+/dev/sda8 /home ext4 noatime 0 0
+/dev/sdb11 /var ext4 noatime 0 0
-/dev/sda7 / ext4 defaults 1 1
-/dev/sda8 /home ext4 defaults 1 2
-/dev/sda6 /boot ext4 defaults 1 2
-/dev/sdb3 swap swap defaults 0 0
\ В конце файла нет новой строки
+/dev/sdc3 none swap sw 0 0
+
+proc /proc proc defaults 0 0
+shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/fstab.bak /etc/fstab.bak
--- /mnt/oldroot/etc/fstab.bak 2012-08-17 09:02:14.138123075 -0700
+++ /etc/fstab.bak 1969-12-31 16:00:00.000000000 -0800
@@ -1,3 +0,0 @@
-/dev/sdd1 /mnt/sdd ext3 ntfs defaults 0 0
-proc /proc proc defaults 0 0
-shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/group /etc/group
--- /mnt/oldroot/etc/group 2012-08-13 12:51:38.259218642 -0700
+++ /etc/group 2012-08-23 20:42:29.582505290 -0700
@@ -12,8 +12,8 @@
floppy::11:root,haldaemon
mail::12:mail
news::13:news
-uucp::14:uucp
-man::15:man,fean
+uucp::14:uucp,fean
+man::15:man
console::17:
audio::18:fean
cdrom::19:haldaemon,fean
@@ -21,7 +21,7 @@
tape::26:root
video::27:root,fean
cdrw::80:haldaemon,fean
-usb::85:haldaemon
+usb::85:haldaemon,fean
users::100:games,fean
nofiles:x:200:
smmsp:x:209:smmsp
@@ -31,7 +31,7 @@
nobody::65534:
sshd:x:22:
games:x:35:fean
-plugdev:x:440:haldaemon,usbmux
+plugdev:x:440:haldaemon,usbmux,fean
scanner:x:441:fean
messagebus:x:199:
ldap:x:439:
@@ -49,6 +49,5 @@
openvpn:x:103:
kdm:x:102:
vnstat:x:101:
-guest:x:1001:
-fean:x:1000:
-vboxusers:x:999:
+guest:x:1000:
+fean:x:1001:
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/group- /etc/group-
--- /mnt/oldroot/etc/group- 2012-07-30 14:29:07.000000000 -0700
+++ /etc/group- 2012-08-23 20:42:29.582505290 -0700
@@ -12,8 +12,8 @@
floppy::11:root,haldaemon
mail::12:mail
news::13:news
-uucp::14:uucp
-man::15:man,fean
+uucp::14:uucp,fean
+man::15:man
console::17:
audio::18:fean
cdrom::19:haldaemon,fean
@@ -21,7 +21,7 @@
tape::26:root
video::27:root,fean
cdrw::80:haldaemon,fean
-usb::85:haldaemon
+usb::85:haldaemon,fean
users::100:games,fean
nofiles:x:200:
smmsp:x:209:smmsp
@@ -31,7 +31,7 @@
nobody::65534:
sshd:x:22:
games:x:35:fean
-plugdev:x:440:haldaemon,usbmux
+plugdev:x:440:haldaemon,usbmux,fean
scanner:x:441:fean
messagebus:x:199:
ldap:x:439:
@@ -49,5 +49,5 @@
openvpn:x:103:
kdm:x:102:
vnstat:x:101:
-guest:x:1001:
-fean:x:1000:
+guest:x:1000:
+fean:x:1001:
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/hosts /etc/hosts
--- /mnt/oldroot/etc/hosts 2012-08-02 22:12:36.807581425 -0700
+++ /etc/hosts 2012-08-23 22:40:58.788465748 -0700
@@ -4,4 +4,4 @@
# /var/lib/layman/calculate/profiles/templates/install-3.0/1live/baselayout/hosts
# For modify this file, create /etc/hosts.clt template.
#------------------------------------------------------------------------------
-127.0.0.1 ubfean.local ubfean localhost
+127.0.0.1 calculate.local calculate localhost
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/hp/hplip.conf /etc/hp/hplip.conf
--- /mnt/oldroot/etc/hp/hplip.conf 2012-07-11 09:12:23.000000000 -0700
+++ /etc/hp/hplip.conf 2012-08-13 12:38:15.000000000 -0700
@@ -8,8 +8,8 @@
run=/var/run
ppd=/usr/share/ppd/HP
ppdbase=/usr/share/ppd
-doc=/usr/share/doc/hplip-3.12.6
-html=/usr/share/doc/hplip-3.12.6/html
+doc=/usr/share/doc/hplip-3.12.6-r1
+html=/usr/share/doc/hplip-3.12.6-r1/html
icon=/usr/share/applications
cupsbackend=/usr/libexec/cups/backend
cupsfilter=/usr/libexec/cups/filter
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/init.d/calculate /etc/init.d/calculate
--- /mnt/oldroot/etc/init.d/calculate 2012-07-25 23:09:51.000000000 -0700
+++ /etc/init.d/calculate 2012-08-21 06:44:20.000000000 -0700
@@ -41,6 +41,14 @@
FEATURES="-getbinpkg" FETCHCOMMAND=false DISTDIR=/usr/portage/distfiles emerge $pkg &>/dev/null
}
+new_install_pkg()
+{
+ local pkg=$1
+ ebegin "Installing $pkg"
+ FETCHCOMMAND=false DISTDIR=/usr/portage/distfiles /usr/local/sbin/cl-video-install $pkg &>/dev/null
+ eend $?
+}
+
variable_value()
{
local varname=$1
@@ -68,7 +76,12 @@
then
if ! is_already_install $drv
then
- check_install_ability $drv && install_pkg $drv
+ if [[ -x /usr/local/sbin/cl-video-install ]]
+ then
+ new_install_pkg $drv
+ else
+ check_install_ability $drv && install_pkg $drv
+ fi
fi
eend $?
else
@@ -124,7 +137,11 @@
# reinit net.* services
local roottype=`variable_value os_root_type`
- [[ $roottype == "livecd" ]] && udevadm trigger --action="add" --subsystem-match=net
+ if [[ $roottype == "livecd" ]]
+ then
+ touch /* /bin/* /sbin/*
+ udevadm trigger --action="add" --subsystem-match=net
+ fi
/sbin/rc-update --update
return 0
@@ -137,5 +154,6 @@
rc-update del calculate boot
local distdir="/usr/portage/distfiles"
[[ -d "${distdir}" ]] && [[ -n "`ls ${distdir}`" ]] && rm ${distdir}/*
+ [[ -f /usr/local/sbin/cl-video-install ]] && rm /usr/local/sbin/cl-video-install
fi
}
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/init.d/rsyncd /etc/init.d/rsyncd
--- /mnt/oldroot/etc/init.d/rsyncd 2012-03-01 02:23:52.000000000 -0800
+++ /etc/init.d/rsyncd 2012-08-20 04:27:04.000000000 -0700
@@ -1,23 +1,12 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.init.d,v 1.5 2007/02/23 11:33:59 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.init.d-r1,v 1.1 2012/03/22 22:01:21 idl0r Exp $
+
+command="/usr/bin/rsync"
+command_args="--daemon ${RSYNC_OPTS}"
+pidfile="/var/run/${SVCNAME}.pid"
depend() {
use net
}
-
-start() {
- ebegin "Starting rsyncd"
- start-stop-daemon --start --exec /usr/bin/rsync \
- --pidfile /var/run/rsyncd.pid \
- -- --daemon ${RSYNC_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping rsyncd"
- start-stop-daemon --stop --exec /usr/bin/rsync \
- --pidfile /var/run/rsyncd.pid
- eend $?
-}
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/init.d/snmpd /etc/init.d/snmpd
--- /mnt/oldroot/etc/init.d/snmpd 2012-07-29 23:40:52.251530271 -0700
+++ /etc/init.d/snmpd 2012-08-23 22:41:33.781465768 -0700
@@ -1,17 +1,21 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.init,v 1.2 2011/12/04 10:17:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.init.2,v 1.1 2012/08/19 02:23:59 flameeyes Exp $
+
+SNMPD_PIDFILE="${SNMPD_PIDFILE:-/var/run/snmpd.pid}"
extra_started_commands="reload"
+command="/usr/sbin/snmpd"
+command_args="-p ${SNMP_PIDFILE} $SNMPD_FLAGS}"
+pidfile="${SNMP_PIDFILE}"
+
depend() {
use logger
need net
}
-SNMPD_PIDFILE="${SNMPD_PIDFILE:-/var/run/snmpd.pid}"
-
checkconfig() {
if [ ! -e /etc/snmp/snmpd.conf ] ; then
eerror "${SVCNAME} requires an /etc/snmp/snmpd.conf configuration file"
@@ -19,29 +23,14 @@
fi
}
-start() {
+start_pre() {
checkconfig || return 1
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --quiet --exec /usr/sbin/snmpd \
- -- -p ${SNMPD_PIDFILE} ${SNMPD_FLAGS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --pidfile ${SNMPD_PIDFILE}
- eend $?
}
reload() {
checkconfig || return 1
- if [ ! -f ${SNMPD_PIDFILE} ]; then
- eerror "Cannot reload configuration, ${SVCNAME} is not running"
- eend 1
- return 1
- fi
ebegin "Reloading ${SVCNAME} configuration"
- kill -HUP $(< ${SNMPD_PIDFILE}) &>/dev/null
+ kill -HUP $(cat ${SNMPD_PIDFILE}) 2>&1 > /dev/null
eend $?
}
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/init.d/snmptrapd /etc/init.d/snmptrapd
--- /mnt/oldroot/etc/init.d/snmptrapd 2012-06-17 01:53:03.000000000 -0700
+++ /etc/init.d/snmptrapd 2012-08-20 04:34:04.000000000 -0700
@@ -1,24 +1,15 @@
#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.init,v 1.1 2009/10/16 08:51:05 gengor Exp $
-
-depend() {
- use logger
- need net
-}
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.init.2,v 1.1 2012/08/19 02:23:59 flameeyes Exp $
SNMPTRAPD_PIDFILE="${SNMPTRAPD_PIDFILE:-/var/run/snmptrapd.pid}"
-start() {
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --quiet --exec /usr/sbin/snmptrapd \
- -- -p ${SNMPTRAPD_PIDFILE} ${SNMPTRAPD_FLAGS}
- eend $?
-}
+command="/usr/sbin/snmptrapd"
+command_args="-p ${SNMPTRAPD_PIDFILE} ${SNMPTRAPD_FLAGS}"
+pidfile="${SNMPTRAPD_PIDFILE}"
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --pidfile ${SNMPTRAPD_PIDFILE}
- eend $?
+depend() {
+ use logger
+ need net
}
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/init.d/timidity /etc/init.d/timidity
--- /mnt/oldroot/etc/init.d/timidity 2012-08-08 22:50:37.000000000 -0700
+++ /etc/init.d/timidity 1969-12-31 16:00:00.000000000 -0800
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-
-depend() {
- after alsasound esound
-}
-
-start() {
- ebegin "Starting TiMidity++ Virtual Midi Sequencer"
- test -n "$TIMIDITY_PCM_NAME" && export TIMIDITY_PCM_NAME
- start-stop-daemon --start --background --chdir /usr/share/timidity \
- --chuid timidity:audio --make-pidfile --pidfile /var/run/timidity.pid \
- --exec /usr/bin/timidity -- -iA ${TIMIDITY_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping TiMidity++"
- start-stop-daemon --stop --quiet --pidfile /var/run/timidity.pid
- eend $?
-}
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ldap.conf /etc/ldap.conf
--- /mnt/oldroot/etc/ldap.conf 2010-11-21 13:49:08.000000000 -0800
+++ /etc/ldap.conf 2012-08-23 22:41:38.996465770 -0700
@@ -1,338 +1,6 @@
-# @(#)$Id: ldap.conf,v 2.48 2008/07/03 02:30:29 lukeh Exp $
-#
-# This is the configuration file for the LDAP nameservice
-# switch library and the LDAP PAM module.
-#
-# PADL Software
-# http://www.padl.com
-#
-
-# Your LDAP server. Must be resolvable without using LDAP.
-# Multiple hosts may be specified, each separated by a
-# space. How long nss_ldap takes to failover depends on
-# whether your LDAP client library supports configurable
-# network or connect timeouts (see bind_timelimit).
-host 127.0.0.1
-
-# The distinguished name of the search base.
-base dc=padl,dc=com
-
-# Another way to specify your LDAP server is to provide an
-# uri with the server name. This allows to use
-# Unix Domain Sockets to connect to a local LDAP Server.
-#uri ldap://127.0.0.1/
-#uri ldaps://127.0.0.1/
-#uri ldapi://%2fvar%2frun%2fldapi_sock/
-# Note: %2f encodes the '/' used as directory separator
-
-# The LDAP version to use (defaults to 3
-# if supported by client library)
-#ldap_version 3
-
-# The distinguished name to bind to the server with.
-# Optional: default is to bind anonymously.
-#binddn cn=proxyuser,dc=padl,dc=com
-
-# The credentials to bind with.
-# Optional: default is no credential.
-#bindpw secret
-
-# The distinguished name to bind to the server with
-# if the effective user ID is root. Password is
-# stored in /etc/ldap.secret (mode 600)
-#rootbinddn cn=manager,dc=padl,dc=com
-
-# The port.
-# Optional: default is 389.
-#port 389
-
-# The search scope.
-#scope sub
-#scope one
-#scope base
-
-# Search timelimit
-#timelimit 30
-
-# Bind/connect timelimit
-#bind_timelimit 30
-
-# Reconnect policy:
-# hard_open: reconnect to DSA with exponential backoff if
-# opening connection failed
-# hard_init: reconnect to DSA with exponential backoff if
-# initializing connection failed
-# hard: alias for hard_open
-# soft: return immediately on server failure
-#bind_policy hard
-
-# Connection policy:
-# persist: DSA connections are kept open (default)
-# oneshot: DSA connections destroyed after request
-#nss_connect_policy persist
-
-# Idle timelimit; client will close connections
-# (nss_ldap only) if the server has not been contacted
-# for the number of seconds specified below.
-#idle_timelimit 3600
-
-# Use paged rseults
-#nss_paged_results yes
-
-# Pagesize: when paged results enable, used to set the
-# pagesize to a custom value
-#pagesize 1000
-
-# Filter to AND with uid=%s
-#pam_filter objectclass=account
-
-# The user ID attribute (defaults to uid)
-#pam_login_attribute uid
-
-# Search the root DSE for the password policy (works
-# with Netscape Directory Server)
-#pam_lookup_policy yes
-
-# Check the 'host' attribute for access control
-# Default is no; if set to yes, and user has no
-# value for the host attribute, and pam_ldap is
-# configured for account management (authorization)
-# then the user will not be allowed to login.
-#pam_check_host_attr yes
-
-# Check the 'authorizedService' attribute for access
-# control
-# Default is no; if set to yes, and the user has no
-# value for the authorizedService attribute, and
-# pam_ldap is configured for account management
-# (authorization) then the user will not be allowed
-# to login.
-#pam_check_service_attr yes
-
-# Group to enforce membership of
-#pam_groupdn cn=PAM,ou=Groups,dc=padl,dc=com
-
-# Group member attribute
-#pam_member_attribute uniquemember
-
-# Specify a minium or maximum UID number allowed
-#pam_min_uid 0
-#pam_max_uid 0
-
-# Template login attribute, default template user
-# (can be overriden by value of former attribute
-# in user's entry)
-#pam_login_attribute userPrincipalName
-#pam_template_login_attribute uid
-#pam_template_login nobody
-
-# HEADS UP: the pam_crypt, pam_nds_passwd,
-# and pam_ad_passwd options are no
-# longer supported.
-#
-# Do not hash the password at all; presume
-# the directory server will do it, if
-# necessary. This is the default.
-#pam_password clear
-
-# Hash password locally; required for University of
-# Michigan LDAP server, and works with Netscape
-# Directory Server if you're using the UNIX-Crypt
-# hash mechanism and not using the NT Synchronization
-# service.
-#pam_password crypt
-
-# Remove old password first, then update in
-# cleartext. Necessary for use with Novell
-# Directory Services (NDS)
-#pam_password nds
-
-# RACF is an alias for the above. For use with
-# IBM RACF
-#pam_password racf
-
-# Update Active Directory password, by
-# creating Unicode password and updating
-# unicodePwd attribute.
-#pam_password ad
-
-# Use the OpenLDAP password change
-# extended operation to update the password.
-#pam_password exop
-
-# Redirect users to a URL or somesuch on password
-# changes.
-#pam_password_prohibit_message Please visit http://internal to change your password.
-
-# Use backlinks for answering initgroups()
-#nss_initgroups backlink
-
-# Enable support for RFC2307bis (distinguished names in group
-# members)
-#nss_schema rfc2307bis
-
-# RFC2307bis naming contexts
-# Syntax:
-# nss_base_XXX base?scope?filter
-# where scope is {base,one,sub}
-# and filter is a filter to be &'d with the
-# default filter.
-# You can omit the suffix eg:
-# nss_base_passwd ou=People,
-# to append the default base DN but this
-# may incur a small performance impact.
-#nss_base_passwd ou=People,dc=padl,dc=com?one
-#nss_base_shadow ou=People,dc=padl,dc=com?one
-#nss_base_group ou=Group,dc=padl,dc=com?one
-#nss_base_hosts ou=Hosts,dc=padl,dc=com?one
-#nss_base_services ou=Services,dc=padl,dc=com?one
-#nss_base_networks ou=Networks,dc=padl,dc=com?one
-#nss_base_protocols ou=Protocols,dc=padl,dc=com?one
-#nss_base_rpc ou=Rpc,dc=padl,dc=com?one
-#nss_base_ethers ou=Ethers,dc=padl,dc=com?one
-#nss_base_netmasks ou=Networks,dc=padl,dc=com?ne
-#nss_base_bootparams ou=Ethers,dc=padl,dc=com?one
-#nss_base_aliases ou=Aliases,dc=padl,dc=com?one
-#nss_base_netgroup ou=Netgroup,dc=padl,dc=com?one
-
-# attribute/objectclass mapping
-# Syntax:
-#nss_map_attribute rfc2307attribute mapped_attribute
-#nss_map_objectclass rfc2307objectclass mapped_objectclass
-
-# configure --enable-nds is no longer supported.
-# NDS mappings
-#nss_map_attribute uniqueMember member
-
-# Services for UNIX 3.5 mappings
-#nss_map_objectclass posixAccount User
-#nss_map_objectclass shadowAccount User
-#nss_map_attribute uid msSFU30Name
-#nss_map_attribute uniqueMember msSFU30PosixMember
-#nss_map_attribute userPassword msSFU30Password
-#nss_map_attribute homeDirectory msSFU30HomeDirectory
-#nss_map_attribute homeDirectory msSFUHomeDirectory
-#nss_map_objectclass posixGroup Group
-#pam_login_attribute msSFU30Name
-#pam_filter objectclass=User
-#pam_password ad
-
-# configure --enable-mssfu-schema is no longer supported.
-# Services for UNIX 2.0 mappings
-#nss_map_objectclass posixAccount User
-#nss_map_objectclass shadowAccount user
-#nss_map_attribute uid msSFUName
-#nss_map_attribute uniqueMember posixMember
-#nss_map_attribute userPassword msSFUPassword
-#nss_map_attribute homeDirectory msSFUHomeDirectory
-#nss_map_attribute shadowLastChange pwdLastSet
-#nss_map_objectclass posixGroup Group
-#nss_map_attribute cn msSFUName
-#pam_login_attribute msSFUName
-#pam_filter objectclass=User
-#pam_password ad
-
-# RFC 2307 (AD) mappings
-#nss_map_objectclass posixAccount user
-#nss_map_objectclass shadowAccount user
-#nss_map_attribute uid sAMAccountName
-#nss_map_attribute homeDirectory unixHomeDirectory
-#nss_map_attribute shadowLastChange pwdLastSet
-#nss_map_objectclass posixGroup group
-#nss_map_attribute uniqueMember member
-#pam_login_attribute sAMAccountName
-#pam_filter objectclass=User
-#pam_password ad
-
-# configure --enable-authpassword is no longer supported
-# AuthPassword mappings
-#nss_map_attribute userPassword authPassword
-
-# AIX SecureWay mappings
-#nss_map_objectclass posixAccount aixAccount
-#nss_base_passwd ou=aixaccount,?one
-#nss_map_attribute uid userName
-#nss_map_attribute gidNumber gid
-#nss_map_attribute uidNumber uid
-#nss_map_attribute userPassword passwordChar
-#nss_map_objectclass posixGroup aixAccessGroup
-#nss_base_group ou=aixgroup,?one
-#nss_map_attribute cn groupName
-#nss_map_attribute uniqueMember member
-#pam_login_attribute userName
-#pam_filter objectclass=aixAccount
-#pam_password clear
-
-# For pre-RFC2307bis automount schema
-#nss_map_objectclass automountMap nisMap
-#nss_map_attribute automountMapName nisMapName
-#nss_map_objectclass automount nisObject
-#nss_map_attribute automountKey cn
-#nss_map_attribute automountInformation nisMapEntry
-
-# Netscape SDK LDAPS
-#ssl on
-
-# Netscape SDK SSL options
-#sslpath /etc/ssl/certs
-
-# OpenLDAP SSL mechanism
-# start_tls mechanism uses the normal LDAP port, LDAPS typically 636
-#ssl start_tls
-###ssl on
-# Gentoo note: Don't use 'ssl on' in 249/250. They are broken in some cases! Use start_tls instead.
-
-# OpenLDAP SSL options
-# Require and verify server certificate (yes/no)
-# Default is to use libldap's default behavior, which can be configured in
-# /etc/openldap/ldap.conf using the TLS_REQCERT setting. The default for
-# OpenLDAP 2.0 and earlier is "no", for 2.1 and later is "yes".
-#tls_checkpeer yes
-
-# CA certificates for server certificate verification
-# At least one of these are required if tls_checkpeer is "yes"
-#tls_cacertfile /etc/ssl/ca.cert
-#tls_cacertdir /etc/ssl/certs
-
-# Seed the PRNG if /dev/urandom is not provided
-#tls_randfile /var/run/egd-pool
-
-# SSL cipher suite
-# See man ciphers for syntax
-#tls_ciphers TLSv1
-
-# Client certificate and key
-# Use these, if your server requires client authentication.
-#tls_cert
-#tls_key
-
-# Disable SASL security layers. This is needed for AD.
-#sasl_secprops maxssf=0
-
-# Override the default Kerberos ticket cache location.
-#krb5_ccname FILE:/etc/.ldapcache
-
-# Timeout behavior
-# Upstream nss_ldap hard-codes these values:
-#nss_reconnect_tries 5 # number of times to double the sleep time
-#nss_reconnect_sleeptime 4 # initial sleep value
-#nss_reconnect_maxsleeptime 64 # max sleep value to cap at
-#nss_reconnect_maxconntries 2 # how many tries before sleeping
-# This leads to a delay of 124 seconds (4+8+16+32+64=124) per lookup if the
-# server is not available.
-
-# For Gentoo's distribution of nss_ldap, as of 250-r1, we use these values
-# (The hardwired constants in the code are changed to them as well):
-nss_reconnect_tries 4 # number of times to double the sleep time
-nss_reconnect_sleeptime 1 # initial sleep value
-nss_reconnect_maxsleeptime 16 # max sleep value to cap at
-nss_reconnect_maxconntries 2 # how many tries before sleeping
-# This leads to a delay of 15 seconds (1+2+4+8=15)
-
-# If you are impatient, and know your LDAP server is reliable, fast or local,
-# you may wish to use these values instead:
-#nss_reconnect_tries 1 # number of times to double the sleep time
-#nss_reconnect_sleeptime 1 # initial sleep value
-#nss_reconnect_maxsleeptime 1 # max sleep value to cap at
-#nss_reconnect_maxconntries 3 # how many tries before sleeping
-# This leads to a delay of 1 second.
+#------------------------------------------------------------------------------
+# Modified Calculate-client 2.2.29
+# Processing template files:
+# /var/lib/layman/calculate/profiles/templates/client/undomain/nss_ldap/ldap.conf
+# For modify this file, create /etc/ldap.conf.clt template.
+#------------------------------------------------------------------------------
Binary files /mnt/oldroot/etc/ld.so.cache and /etc/ld.so.cache differ
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ld.so.conf /etc/ld.so.conf
--- /mnt/oldroot/etc/ld.so.conf 2012-08-08 22:41:58.019983397 -0700
+++ /etc/ld.so.conf 2012-05-21 03:21:49.000000000 -0700
@@ -16,7 +16,4 @@
/usr/lib64/qt4
/usr/lib32/qt4
/usr/lib/qt4
-/usr/games/lib64
-/usr/games/lib32
-/usr/games/lib
/usr/lib32/libstdc++-v3/
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf /etc/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
--- /mnt/oldroot/etc/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf 2012-08-05 23:12:46.651217371 -0700
+++ /etc/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf 2012-08-23 22:37:40.314465637 -0700
@@ -1,2 +1,2 @@
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4/32
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.4
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/motd /etc/motd
--- /mnt/oldroot/etc/motd 1969-12-31 16:00:00.000000000 -0800
+++ /etc/motd 2012-08-23 22:40:59.154465748 -0700
@@ -0,0 +1,19 @@
+Добро πожаловать в установочный диск Calculate Linux Desktop!
+
+Если какой-либо из сетевых адаπтеров был обнаружен πри загрузке, он будет
+автоматически сконфигурирован, если в сети достуπен DHCP сервер.
+Для указания сетевых настроек используйте утилиту "cl-install".
+Пример:"cl-setup-network --ip eth0:no:192.168.1.100:24 \
+ --route default:192.168.1.1 --dns 192.168.1.1"
+И перезапустите NetworkManager командой "/etc/init.d/NetworkManager restart".
+Выполните "wicd-curses" для указания сетевой карты и IP адреса вручную.
+
+Последняя версия руководства всегда достуπна на веб-сайте Calculate Linux
+http://www.calculate-linux.org/main/ru/handbook
+
+Для заπуска ssh сервера в системе, выπолните "/etc/init.d/sshd start".
+
+Пожалуйста сообщайте о любых найденных ошибках на
+http://irc.calculate-linux.org.
+
+Сπасибо за исπользование Calculate Linux!
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/mtab /etc/mtab
--- /mnt/oldroot/etc/mtab 2012-08-23 11:58:21.938074820 -0700
+++ /etc/mtab 2012-08-25 21:35:36.991425289 -0700
@@ -3,9 +3,16 @@
sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
udev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=349022,mode=755 0 0
devpts /dev/pts devpts rw,relatime,gid=5,mode=620 0 0
-/dev/sda7 / ext4 rw,relatime,data=ordered 0 0
+/dev/sdb12 / ext4 rw,noatime,commit=0 0 0
+tmpfs /run tmpfs rw,nosuid,nodev,relatime,mode=755 0 0
rc-svcdir /lib64/rc/init.d tmpfs rw,nosuid,nodev,noexec,relatime,size=1024k,mode=755 0 0
cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0
cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0
+shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
+/dev/sda6 /boot ext4 rw,noatime,commit=0 0 0
+/dev/sda8 /home ext4 rw,noatime,commit=0 0 0
+/dev/sdb11 /var ext4 rw,noatime,commit=0 0 0
usbfs /proc/bus/usb usbfs rw,noexec,nosuid,devmode=0664,devgid=85 0 0
binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,noexec,nosuid,nodev 0 0
+/dev/sdb6 /media/Home ext4 rw,nosuid,nodev,uhelper=udisks 0 0
+/dev/sda7 /mnt/oldroot ext4 rw 0 0
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/NetworkManager/system-connections/Auto_eth0 /etc/NetworkManager/system-connections/Auto_eth0
--- /mnt/oldroot/etc/NetworkManager/system-connections/Auto_eth0 2012-07-29 23:40:51.155530271 -0700
+++ /etc/NetworkManager/system-connections/Auto_eth0 2012-08-23 22:41:33.486465768 -0700
@@ -5,7 +5,7 @@
[connection]
id=Auto_eth0
-uuid=0d9406f2-efb1-22d2-cfbf-533b3b40ce1a
+uuid=cd8ff1d1-35a6-bb51-aa62-a09d8c0aa82a
type=802-3-ethernet
[ipv6]
@@ -13,4 +13,3 @@
[ipv4]
method=auto
-!addresses1=del
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/nsswitch.conf /etc/nsswitch.conf
--- /mnt/oldroot/etc/nsswitch.conf 2012-08-09 23:07:14.000000000 -0700
+++ /etc/nsswitch.conf 2012-08-23 22:41:38.474465770 -0700
@@ -1,17 +1,15 @@
-# /etc/nsswitch.conf:
-# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nsswitch.conf,v 1.1 2006/09/29 23:52:23 vapier Exp $
+#------------------------------------------------------------------------------
+# Modified Calculate-client 2.2.29
+# Processing template files:
+# /var/lib/layman/calculate/profiles/templates/client/undomain/glibc/nsswitch.conf
+# For modify this file, create /etc/nsswitch.conf.clt template.
+#------------------------------------------------------------------------------
passwd: compat
shadow: compat
group: compat
-
-# passwd: db files nis
-# shadow: db files nis
-# group: db files nis
-
hosts: files dns
networks: files dns
-
services: db files
protocols: db files
rpc: db files
@@ -19,6 +17,5 @@
netmasks: files
netgroup: files
bootparams: files
-
automount: files
-aliases: files
+aliases: files
\ В конце файла нет новой строки
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/pam.d/system-auth /etc/pam.d/system-auth
--- /mnt/oldroot/etc/pam.d/system-auth 2012-07-29 23:40:51.653530272 -0700
+++ /etc/pam.d/system-auth 2012-08-23 22:41:39.039465770 -0700
@@ -1,19 +1,16 @@
#------------------------------------------------------------------------------
-# Modified Calculate-install 3.0.0
-# Processed template files:
-# /var/lib/layman/calculate/profiles/templates/install-3.0/1live/pambase/system-auth
+# Modified Calculate-client 2.2.29
+# Processing template files:
+# /var/lib/layman/calculate/profiles/templates/client/undomain/pambase/system-auth
# For modify this file, create /etc/pam.d/system-auth.clt template.
#------------------------------------------------------------------------------
+
auth required pam_env.so
auth sufficient pam_unix.so
auth required pam_deny.so
-
account required pam_unix.so
-
password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
password sufficient pam_unix.so nullok sha256 shadow use_authtok
password required pam_deny.so
-
session required pam_limits.so
-session required pam_unix.so
-
+session required pam_unix.so
\ В конце файла нет новой строки
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/papersize /etc/papersize
--- /mnt/oldroot/etc/papersize 2012-08-02 22:13:34.971581456 -0700
+++ /etc/papersize 2012-01-28 12:54:43.000000000 -0800
@@ -1,2 +1 @@
-#a4
-letter
\ В конце файла нет новой строки
+a4
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/passwd /etc/passwd
--- /mnt/oldroot/etc/passwd 2012-08-08 22:49:42.847281157 -0700
+++ /etc/passwd 2012-08-23 20:42:29.582505290 -0700
@@ -29,5 +29,3 @@
usbmux:x:107:85:added by portage for usbmuxd:/dev/null:/sbin/nologin
vnstat:x:108:101:added by portage for vnstat:/dev/null:/sbin/nologin
fean:x:1000:1001::/home/fean:/bin/bash
-games:x:36:35:added by portage for stratagus:/usr/games:/bin/bash
-timidity:x:109:18:added by portage for timidity++:/var/lib/timidity:/sbin/nologin
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/passwd- /etc/passwd-
--- /mnt/oldroot/etc/passwd- 2012-08-08 22:40:48.000000000 -0700
+++ /etc/passwd- 2012-08-23 20:42:29.582505290 -0700
@@ -29,4 +29,3 @@
usbmux:x:107:85:added by portage for usbmuxd:/dev/null:/sbin/nologin
vnstat:x:108:101:added by portage for vnstat:/dev/null:/sbin/nologin
fean:x:1000:1001::/home/fean:/bin/bash
-games:x:36:35:added by portage for stratagus:/usr/games:/bin/bash
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/portage/package.keywords/custom /etc/portage/package.keywords/custom
--- /mnt/oldroot/etc/portage/package.keywords/custom 2012-08-08 22:44:15.408643473 -0700
+++ /etc/portage/package.keywords/custom 2011-10-24 02:22:03.000000000 -0700
@@ -1,8 +0,0 @@
-#required by =www-client/firefox-14.0.1 (argument)
-=www-client/firefox-14.0.1 ~amd64
-#required by =games-engines/stratagus-2.2.6-r1 (argument)
-=games-engines/stratagus-2.2.6-r1 ~amd64
-#required by games-strategy/wargus-data-0, required by =games-strategy/wargus-data-0 (argument)
-=games-strategy/wargus-2.2.6-r2 ~amd64
-#required by =games-strategy/wargus-data-0 (argument)
-=games-strategy/wargus-data-0 ~amd64
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/portage/package.use/custom /etc/portage/package.use/custom
--- /mnt/oldroot/etc/portage/package.use/custom 2012-08-05 23:07:37.019217198 -0700
+++ /etc/portage/package.use/custom 2011-10-24 02:22:03.000000000 -0700
@@ -1,2 +0,0 @@
-#required by games-strategy/freecraft-1.18-r3, required by =games-strategy/freecraft-1.18-r3 (argument)
-=sys-apps/util-linux-2.20.1-r2 ddate
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/portage/savedconfig/sys-apps/busybox-1.20.1 /etc/portage/savedconfig/sys-apps/busybox-1.20.1
--- /mnt/oldroot/etc/portage/savedconfig/sys-apps/busybox-1.20.1 2012-06-11 06:22:43.000000000 -0700
+++ /etc/portage/savedconfig/sys-apps/busybox-1.20.1 1969-12-31 16:00:00.000000000 -0800
@@ -1,1025 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.20.1
-# Mon Jun 11 13:22:21 2012
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-CONFIG_DESKTOP=y
-CONFIG_EXTRA_COMPAT=y
-CONFIG_INCLUDE_SUSv2=y
-CONFIG_USE_PORTABLE_CODE=y
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-CONFIG_FEATURE_COMPRESS_USAGE=y
-CONFIG_FEATURE_INSTALLER=y
-CONFIG_INSTALL_NO_USR=y
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_UNICODE_SUPPORT=y
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=63
-CONFIG_LAST_SUPPORTED_WCHAR=767
-CONFIG_UNICODE_COMBINING_WCHARS=y
-CONFIG_UNICODE_WIDE_WCHARS=y
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-CONFIG_UNICODE_PRESERVE_BROKEN=y
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-CONFIG_FEATURE_CLEAN_UP=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_FEATURE_PIDFILE=y
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-CONFIG_FEATURE_PREFER_APPLETS=y
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
-
-#
-# Build Options
-#
-CONFIG_STATIC=y
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS=""
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_FEATURE_SYSTEMD=y
-CONFIG_FEATURE_RTMINMAX=y
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SMALL=1
-CONFIG_FEATURE_FAST_TOP=y
-CONFIG_FEATURE_ETC_NETWORKS=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-CONFIG_FEATURE_EDITING_VI=y
-CONFIG_FEATURE_EDITING_HISTORY=255
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
-CONFIG_FEATURE_REVERSE_SEARCH=y
-CONFIG_FEATURE_TAB_COMPLETION=y
-CONFIG_FEATURE_USERNAME_COMPLETION=y
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-CONFIG_FEATURE_EDITING_ASK_TERMINAL=y
-CONFIG_FEATURE_NON_POSIX_CP=y
-CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-# CONFIG_MONOTONIC_SYSCALL is not set
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-CONFIG_FEATURE_SEAMLESS_XZ=y
-CONFIG_FEATURE_SEAMLESS_LZMA=y
-CONFIG_FEATURE_SEAMLESS_BZ2=y
-CONFIG_FEATURE_SEAMLESS_GZ=y
-CONFIG_FEATURE_SEAMLESS_Z=y
-CONFIG_AR=y
-CONFIG_FEATURE_AR_LONG_FILENAMES=y
-CONFIG_FEATURE_AR_CREATE=y
-CONFIG_BUNZIP2=y
-CONFIG_BZIP2=y
-CONFIG_CPIO=y
-CONFIG_FEATURE_CPIO_O=y
-CONFIG_FEATURE_CPIO_P=y
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_GZIP=y
-CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
-CONFIG_GZIP_FAST=0
-CONFIG_LZOP=y
-CONFIG_LZOP_COMPR_HIGH=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_AUTODETECT=y
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
-CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-CONFIG_FEATURE_TAR_TO_COMMAND=y
-CONFIG_FEATURE_TAR_UNAME_GNAME=y
-CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
-# CONFIG_FEATURE_TAR_SELINUX is not set
-CONFIG_UNCOMPRESS=y
-CONFIG_UNLZMA=y
-CONFIG_FEATURE_LZMA_FAST=y
-CONFIG_LZMA=y
-CONFIG_UNXZ=y
-CONFIG_XZ=y
-CONFIG_UNZIP=y
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_FEATURE_DATE_NANO=y
-CONFIG_FEATURE_DATE_COMPAT=y
-# CONFIG_HOSTID is not set
-CONFIG_ID=y
-CONFIG_GROUPS=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_SUSV3=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-CONFIG_FEATURE_TR_EQUIV=y
-CONFIG_BASE64=y
-CONFIG_WHO=y
-CONFIG_USERS=y
-CONFIG_CAL=y
-CONFIG_CATV=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
-CONFIG_CHROOT=y
-CONFIG_CKSUM=y
-CONFIG_COMM=y
-CONFIG_CP=y
-CONFIG_FEATURE_CP_LONG_OPTIONS=y
-CONFIG_CUT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
-CONFIG_FEATURE_DD_IBS_OBS=y
-CONFIG_DF=y
-CONFIG_FEATURE_DF_FANCY=y
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-CONFIG_EXPAND=y
-CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-CONFIG_FSYNC=y
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LN=y
-# CONFIG_LOGNAME is not set
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-# CONFIG_OD is not set
-CONFIG_PRINTENV=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-CONFIG_SPLIT=y
-CONFIG_FEATURE_SPLIT_FANCY=y
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-CONFIG_STTY=y
-CONFIG_SUM=y
-CONFIG_SYNC=y
-CONFIG_TAC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNEXPAND=y
-CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_FGCONSOLE=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_RESIZE=y
-CONFIG_FEATURE_RESIZE_PRINT=y
-CONFIG_SETCONSOLE=y
-CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
-CONFIG_SETFONT=y
-CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
-CONFIG_DEFAULT_SETFONT_DIR=""
-CONFIG_SETKEYCODES=y
-CONFIG_SETLOGCONS=y
-CONFIG_SHOWKEY=y
-
-#
-# Common options for loadfont and setfont
-#
-CONFIG_FEATURE_LOADFONT_PSF2=y
-CONFIG_FEATURE_LOADFONT_RAW=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-CONFIG_PIPE_PROGRESS=y
-# CONFIG_RUN_PARTS is not set
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_PATCH=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_REGEX_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-CONFIG_CMP=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
-CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_ED=y
-CONFIG_SED=y
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_MAXDEPTH=y
-CONFIG_FEATURE_FIND_NEWER=y
-CONFIG_FEATURE_FIND_INUM=y
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_USER=y
-CONFIG_FEATURE_FIND_GROUP=y
-CONFIG_FEATURE_FIND_NOT=y
-CONFIG_FEATURE_FIND_DEPTH=y
-CONFIG_FEATURE_FIND_PAREN=y
-CONFIG_FEATURE_FIND_SIZE=y
-CONFIG_FEATURE_FIND_PRUNE=y
-CONFIG_FEATURE_FIND_DELETE=y
-CONFIG_FEATURE_FIND_PATH=y
-CONFIG_FEATURE_FIND_REGEX=y
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-CONFIG_FEATURE_FIND_LINKS=y
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-CONFIG_GINIT=y
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-CONFIG_INIT=y
-CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_KILL_REMOVED=y
-CONFIG_FEATURE_KILL_DELAY=0
-CONFIG_FEATURE_INIT_SCTTY=y
-CONFIG_FEATURE_INIT_SYSLOG=y
-CONFIG_FEATURE_EXTRA_QUIET=y
-CONFIG_FEATURE_INIT_COREDUMPS=y
-CONFIG_FEATURE_INITRD=y
-CONFIG_INIT_TERMINAL_TYPE="linux"
-CONFIG_MESG=y
-CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-CONFIG_FEATURE_SHADOWPASSWDS=y
-CONFIG_USE_BB_PWD_GRP=y
-CONFIG_USE_BB_SHADOW=y
-CONFIG_USE_BB_CRYPT=y
-CONFIG_USE_BB_CRYPT_SHA=y
-CONFIG_ADDUSER=y
-CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
-CONFIG_FEATURE_CHECK_NAMES=y
-CONFIG_FIRST_SYSTEM_ID=100
-CONFIG_LAST_SYSTEM_ID=999
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
-CONFIG_DELUSER=y
-CONFIG_DELGROUP=y
-CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
-CONFIG_GETTY=y
-CONFIG_LOGIN=y
-CONFIG_LOGIN_SESSION_AS_CHILD=y
-# CONFIG_PAM is not set
-CONFIG_LOGIN_SCRIPTS=y
-CONFIG_FEATURE_NOLOGIN=y
-CONFIG_FEATURE_SECURETTY=y
-CONFIG_PASSWD=y
-CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
-CONFIG_CRYPTPW=y
-CONFIG_CHPASSWD=y
-CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des"
-CONFIG_SU=y
-CONFIG_FEATURE_SU_SYSLOG=y
-CONFIG_FEATURE_SU_CHECKS_SHELLS=y
-# CONFIG_SULOGIN is not set
-CONFIG_VLOCK=y
-
-#
-# Linux Ext2 FS Progs
-#
-CONFIG_CHATTR=y
-CONFIG_FSCK=y
-CONFIG_LSATTR=y
-CONFIG_TUNE2FS=y
-
-#
-# Linux Module Utilities
-#
-CONFIG_MODINFO=y
-CONFIG_MODPROBE_SMALL=y
-CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y
-CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
-# CONFIG_INSMOD is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-CONFIG_FEATURE_INSMOD_TRY_MMAP=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-
-#
-# Linux System Utilities
-#
-CONFIG_BLOCKDEV=y
-CONFIG_MDEV=y
-CONFIG_FEATURE_MDEV_CONF=y
-CONFIG_FEATURE_MDEV_RENAME=y
-CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
-CONFIG_FEATURE_MDEV_EXEC=y
-CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
-CONFIG_REV=y
-CONFIG_ACPID=y
-CONFIG_FEATURE_ACPID_COMPAT=y
-CONFIG_BLKID=y
-CONFIG_FEATURE_BLKID_TYPE=y
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-CONFIG_FBSET=y
-CONFIG_FEATURE_FBSET_FANCY=y
-CONFIG_FEATURE_FBSET_READMODE=y
-CONFIG_FDFLUSH=y
-CONFIG_FDFORMAT=y
-CONFIG_FDISK=y
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-CONFIG_FEATURE_FDISK_WRITABLE=y
-CONFIG_FEATURE_AIX_LABEL=y
-CONFIG_FEATURE_SGI_LABEL=y
-CONFIG_FEATURE_SUN_LABEL=y
-CONFIG_FEATURE_OSF_LABEL=y
-CONFIG_FEATURE_GPT_LABEL=y
-CONFIG_FEATURE_FDISK_ADVANCED=y
-CONFIG_FINDFS=y
-CONFIG_FLOCK=y
-CONFIG_FREERAMDISK=y
-# CONFIG_FSCK_MINIX is not set
-CONFIG_MKFS_EXT2=y
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-CONFIG_MKFS_REISER=y
-CONFIG_MKFS_VFAT=y
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
-CONFIG_HD=y
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-CONFIG_IPCRM=y
-CONFIG_IPCS=y
-CONFIG_LOSETUP=y
-CONFIG_LSPCI=y
-CONFIG_LSUSB=y
-CONFIG_MKSWAP=y
-CONFIG_FEATURE_MKSWAP_UUID=y
-CONFIG_MORE=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_FAKE=y
-CONFIG_FEATURE_MOUNT_VERBOSE=y
-CONFIG_FEATURE_MOUNT_HELPERS=y
-CONFIG_FEATURE_MOUNT_LABEL=y
-# CONFIG_FEATURE_MOUNT_NFS is not set
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-# CONFIG_RDEV is not set
-# CONFIG_READPROFILE is not set
-CONFIG_RTCWAKE=y
-CONFIG_SCRIPT=y
-CONFIG_SCRIPTREPLAY=y
-CONFIG_SETARCH=y
-CONFIG_SWAPONOFF=y
-CONFIG_FEATURE_SWAPON_PRI=y
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-CONFIG_FEATURE_MTAB_SUPPORT=y
-CONFIG_VOLUMEID=y
-
-#
-# Filesystem/Volume identification
-#
-CONFIG_FEATURE_VOLUMEID_EXT=y
-CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_FEATURE_VOLUMEID_REISERFS=y
-CONFIG_FEATURE_VOLUMEID_FAT=y
-CONFIG_FEATURE_VOLUMEID_HFS=y
-CONFIG_FEATURE_VOLUMEID_JFS=y
-CONFIG_FEATURE_VOLUMEID_XFS=y
-CONFIG_FEATURE_VOLUMEID_NTFS=y
-CONFIG_FEATURE_VOLUMEID_ISO9660=y
-CONFIG_FEATURE_VOLUMEID_UDF=y
-CONFIG_FEATURE_VOLUMEID_LUKS=y
-CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_FEATURE_VOLUMEID_CRAMFS=y
-CONFIG_FEATURE_VOLUMEID_ROMFS=y
-CONFIG_FEATURE_VOLUMEID_SYSV=y
-CONFIG_FEATURE_VOLUMEID_OCFS2=y
-CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
-
-#
-# Miscellaneous Utilities
-#
-CONFIG_CONSPY=y
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-CONFIG_FEATURE_LESS_MARKS=y
-CONFIG_FEATURE_LESS_REGEXP=y
-CONFIG_FEATURE_LESS_WINCH=y
-CONFIG_FEATURE_LESS_ASK_TERMINAL=y
-CONFIG_FEATURE_LESS_DASHCMD=y
-CONFIG_FEATURE_LESS_LINENUMS=y
-CONFIG_NANDWRITE=y
-CONFIG_NANDDUMP=y
-CONFIG_SETSERIAL=y
-CONFIG_UBIATTACH=y
-CONFIG_UBIDETACH=y
-CONFIG_UBIMKVOL=y
-CONFIG_UBIRMVOL=y
-CONFIG_UBIRSVOL=y
-CONFIG_UBIUPDATEVOL=y
-CONFIG_ADJTIMEX=y
-CONFIG_BBCONFIG=y
-CONFIG_FEATURE_COMPRESS_BBCONFIG=y
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-CONFIG_CHAT=y
-CONFIG_FEATURE_CHAT_NOFAIL=y
-CONFIG_FEATURE_CHAT_TTY_HIFI=y
-CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
-CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
-CONFIG_FEATURE_CHAT_SEND_ESCAPES=y
-CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y
-CONFIG_FEATURE_CHAT_CLR_ABORT=y
-CONFIG_CHRT=y
-CONFIG_CROND=y
-CONFIG_FEATURE_CROND_D=y
-CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
-CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-CONFIG_DEVMEM=y
-CONFIG_EJECT=y
-CONFIG_FEATURE_EJECT_SCSI=y
-# CONFIG_FBSPLASH is not set
-CONFIG_FLASHCP=y
-CONFIG_FLASH_LOCK=y
-CONFIG_FLASH_UNLOCK=y
-CONFIG_FLASH_ERASEALL=y
-CONFIG_IONICE=y
-# CONFIG_INOTIFYD is not set
-CONFIG_LAST=y
-# CONFIG_FEATURE_LAST_SMALL is not set
-CONFIG_FEATURE_LAST_FANCY=y
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
-CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
-CONFIG_MAKEDEVS=y
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-CONFIG_FEATURE_MAKEDEVS_TABLE=y
-CONFIG_MAN=y
-CONFIG_MICROCOM=y
-CONFIG_MOUNTPOINT=y
-CONFIG_MT=y
-CONFIG_RAIDAUTORUN=y
-CONFIG_READAHEAD=y
-# CONFIG_RFKILL is not set
-CONFIG_RUNLEVEL=y
-CONFIG_RX=y
-CONFIG_SETSID=y
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-CONFIG_TIME=y
-CONFIG_TIMEOUT=y
-CONFIG_TTYSIZE=y
-CONFIG_VOLNAME=y
-CONFIG_WALL=y
-CONFIG_WATCHDOG=y
-
-#
-# Networking Utilities
-#
-CONFIG_NAMEIF=y
-CONFIG_FEATURE_NAMEIF_EXTENDED=y
-CONFIG_NBDCLIENT=y
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-CONFIG_NC_110_COMPAT=y
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-CONFIG_WHOIS=y
-CONFIG_FEATURE_IPV6=y
-CONFIG_FEATURE_UNIX_LOCAL=y
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-CONFIG_VERBOSE_RESOLUTION_ERRORS=y
-CONFIG_ARP=y
-CONFIG_ARPING=y
-CONFIG_BRCTL=y
-CONFIG_FEATURE_BRCTL_FANCY=y
-CONFIG_FEATURE_BRCTL_SHOW=y
-# CONFIG_DNSD is not set
-CONFIG_ETHER_WAKE=y
-# CONFIG_FAKEIDENTD is not set
-CONFIG_FTPD=y
-CONFIG_FEATURE_FTP_WRITE=y
-CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-CONFIG_HOSTNAME=y
-CONFIG_HTTPD=y
-CONFIG_FEATURE_HTTPD_RANGES=y
-CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-CONFIG_FEATURE_HTTPD_SETUID=y
-CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
-CONFIG_FEATURE_HTTPD_AUTH_MD5=y
-CONFIG_FEATURE_HTTPD_CGI=y
-CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
-CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
-CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
-CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
-CONFIG_FEATURE_HTTPD_PROXY=y
-CONFIG_FEATURE_HTTPD_GZIP=y
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-CONFIG_IFENSLAVE=y
-CONFIG_IFPLUGD=y
-CONFIG_IFUPDOWN=y
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
-CONFIG_FEATURE_IFUPDOWN_IP=y
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-CONFIG_FEATURE_IFUPDOWN_IPV6=y
-CONFIG_FEATURE_IFUPDOWN_MAPPING=y
-CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-CONFIG_FEATURE_NETSTAT_PRG=y
-CONFIG_NSLOOKUP=y
-CONFIG_NTPD=y
-CONFIG_FEATURE_NTPD_SERVER=y
-CONFIG_PSCAN=y
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-CONFIG_TELNETD=y
-CONFIG_FEATURE_TELNETD_STANDALONE=y
-CONFIG_FEATURE_TELNETD_INETD_WAIT=y
-CONFIG_TFTP=y
-CONFIG_TFTPD=y
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
-CONFIG_TFTP_DEBUG=y
-CONFIG_TRACEROUTE=y
-CONFIG_TRACEROUTE6=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
-CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
-CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
-CONFIG_TUNCTL=y
-CONFIG_FEATURE_TUNCTL_UG=y
-CONFIG_UDHCPC6=y
-CONFIG_UDHCPD=y
-CONFIG_DHCPRELAY=y
-CONFIG_DUMPLEASES=y
-CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
-CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
-CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_UDHCPC=y
-CONFIG_FEATURE_UDHCPC_ARPING=y
-CONFIG_FEATURE_UDHCP_PORT=y
-CONFIG_UDHCP_DEBUG=9
-CONFIG_FEATURE_UDHCP_RFC3397=y
-CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
-# CONFIG_UDPSVD is not set
-CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-CONFIG_ZCIP=y
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-CONFIG_LPR=y
-CONFIG_LPQ=y
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET="us-ascii"
-CONFIG_POPMAILDIR=y
-CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-CONFIG_SENDMAIL=y
-
-#
-# Process Utilities
-#
-CONFIG_IOSTAT=y
-CONFIG_LSOF=y
-CONFIG_MPSTAT=y
-CONFIG_NMETER=y
-CONFIG_PMAP=y
-CONFIG_POWERTOP=y
-CONFIG_PSTREE=y
-CONFIG_PWDX=y
-# CONFIG_SMEMCAP is not set
-CONFIG_UPTIME=y
-CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_KILLALL5=y
-CONFIG_PGREP=y
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-CONFIG_PKILL=y
-CONFIG_PS=y
-# CONFIG_FEATURE_PS_WIDE is not set
-# CONFIG_FEATURE_PS_LONG is not set
-CONFIG_FEATURE_PS_TIME=y
-CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
-CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-CONFIG_FEATURE_TOP_SMP_CPU=y
-CONFIG_FEATURE_TOP_DECIMALS=y
-CONFIG_FEATURE_TOP_SMP_PROCESS=y
-CONFIG_FEATURE_TOPMEM=y
-CONFIG_FEATURE_SHOW_THREADS=y
-CONFIG_WATCH=y
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-CONFIG_CHPST=y
-CONFIG_SETUIDGID=y
-CONFIG_ENVUIDGID=y
-CONFIG_ENVDIR=y
-CONFIG_SOFTLIMIT=y
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_ASH_EXPAND_PRMT=y
-CONFIG_CTTYHACK=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-CONFIG_SH_MATH_SUPPORT_64=y
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-CONFIG_FEATURE_SH_STANDALONE=y
-CONFIG_FEATURE_SH_NOFORK=y
-CONFIG_FEATURE_SH_HISTFILESIZE=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_SYSLOGD_DUP=y
-CONFIG_FEATURE_SYSLOGD_CFG=y
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
-CONFIG_LOGREAD=y
-CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
-CONFIG_KLOGD=y
-CONFIG_FEATURE_KLOGD_KLOGCTL=y
-CONFIG_LOGGER=y
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/portage/savedconfig/sys-apps/busybox-1.20.2 /etc/portage/savedconfig/sys-apps/busybox-1.20.2
--- /mnt/oldroot/etc/portage/savedconfig/sys-apps/busybox-1.20.2 1969-12-31 16:00:00.000000000 -0800
+++ /etc/portage/savedconfig/sys-apps/busybox-1.20.2 2012-08-21 14:03:59.000000000 -0700
@@ -0,0 +1,1025 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.20.2
+# Tue Aug 21 21:01:20 2012
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+CONFIG_EXTRA_COMPAT=y
+CONFIG_INCLUDE_SUSv2=y
+CONFIG_USE_PORTABLE_CODE=y
+CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
+CONFIG_INSTALL_NO_USR=y
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+CONFIG_UNICODE_COMBINING_WCHARS=y
+CONFIG_UNICODE_WIDE_WCHARS=y
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+CONFIG_UNICODE_PRESERVE_BROKEN=y
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+CONFIG_FEATURE_CLEAN_UP=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+CONFIG_FEATURE_PREFER_APPLETS=y
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_HAVE_RPC is not set
+
+#
+# Build Options
+#
+CONFIG_STATIC=y
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_SYSROOT=""
+CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options ("make install" behavior)
+#
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_FEATURE_SYSTEMD=y
+CONFIG_FEATURE_RTMINMAX=y
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SMALL=1
+CONFIG_FEATURE_FAST_TOP=y
+CONFIG_FEATURE_ETC_NETWORKS=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=255
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
+CONFIG_FEATURE_REVERSE_SEARCH=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_EDITING_ASK_TERMINAL=y
+CONFIG_FEATURE_NON_POSIX_CP=y
+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
+# CONFIG_MONOTONIC_SYSCALL is not set
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_FEATURE_SEAMLESS_XZ=y
+CONFIG_FEATURE_SEAMLESS_LZMA=y
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+CONFIG_FEATURE_SEAMLESS_Z=y
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
+CONFIG_FEATURE_AR_CREATE=y
+CONFIG_BUNZIP2=y
+CONFIG_BZIP2=y
+CONFIG_CPIO=y
+CONFIG_FEATURE_CPIO_O=y
+CONFIG_FEATURE_CPIO_P=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+CONFIG_GZIP_FAST=0
+CONFIG_LZOP=y
+CONFIG_LZOP_COMPR_HIGH=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_TO_COMMAND=y
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+# CONFIG_FEATURE_TAR_SELINUX is not set
+CONFIG_UNCOMPRESS=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_FEATURE_DATE_NANO=y
+CONFIG_FEATURE_DATE_COMPAT=y
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+CONFIG_GROUPS=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_SUSV3=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_BASE64=y
+CONFIG_WHO=y
+CONFIG_USERS=y
+CONFIG_CAL=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_FEATURE_CP_LONG_OPTIONS=y
+CONFIG_CUT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+CONFIG_FEATURE_DF_FANCY=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+CONFIG_EXPAND=y
+CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_FSYNC=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LN=y
+# CONFIG_LOGNAME is not set
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+# CONFIG_OD is not set
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_FEATURE_FLOAT_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+CONFIG_SPLIT=y
+CONFIG_FEATURE_SPLIT_FANCY=y
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_STTY=y
+CONFIG_SUM=y
+CONFIG_SYNC=y
+CONFIG_TAC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNEXPAND=y
+CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+CONFIG_FEATURE_WC_LARGE=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_FGCONSOLE=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_KBD_MODE=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
+CONFIG_SETFONT=y
+CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
+CONFIG_DEFAULT_SETFONT_DIR=""
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+CONFIG_SHOWKEY=y
+
+#
+# Common options for loadfont and setfont
+#
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+# CONFIG_RUN_PARTS is not set
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_PATCH=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_REGEX_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_ED=y
+CONFIG_SED=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_FEATURE_FIND_LINKS=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_GINIT=y
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+CONFIG_FEATURE_INIT_COREDUMPS=y
+CONFIG_FEATURE_INITRD=y
+CONFIG_INIT_TERMINAL_TYPE="linux"
+CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
+CONFIG_FEATURE_SHADOWPASSWDS=y
+CONFIG_USE_BB_PWD_GRP=y
+CONFIG_USE_BB_SHADOW=y
+CONFIG_USE_BB_CRYPT=y
+CONFIG_USE_BB_CRYPT_SHA=y
+CONFIG_ADDUSER=y
+CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
+CONFIG_FEATURE_CHECK_NAMES=y
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_GETTY=y
+CONFIG_LOGIN=y
+CONFIG_LOGIN_SESSION_AS_CHILD=y
+# CONFIG_PAM is not set
+CONFIG_LOGIN_SCRIPTS=y
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_CRYPTPW=y
+CONFIG_CHPASSWD=y
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des"
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+# CONFIG_SULOGIN is not set
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+CONFIG_TUNE2FS=y
+
+#
+# Linux Module Utilities
+#
+CONFIG_MODINFO=y
+CONFIG_MODPROBE_SMALL=y
+CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y
+CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
+# CONFIG_INSMOD is not set
+# CONFIG_RMMOD is not set
+# CONFIG_LSMOD is not set
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_INSMOD_TRY_MMAP=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+# CONFIG_FEATURE_MODUTILS_ALIAS is not set
+# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+CONFIG_BLOCKDEV=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_REV=y
+CONFIG_ACPID=y
+CONFIG_FEATURE_ACPID_COMPAT=y
+CONFIG_BLKID=y
+CONFIG_FEATURE_BLKID_TYPE=y
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+CONFIG_FEATURE_FDISK_WRITABLE=y
+CONFIG_FEATURE_AIX_LABEL=y
+CONFIG_FEATURE_SGI_LABEL=y
+CONFIG_FEATURE_SUN_LABEL=y
+CONFIG_FEATURE_OSF_LABEL=y
+CONFIG_FEATURE_GPT_LABEL=y
+CONFIG_FEATURE_FDISK_ADVANCED=y
+CONFIG_FINDFS=y
+CONFIG_FLOCK=y
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+CONFIG_MKFS_EXT2=y
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+CONFIG_MKFS_REISER=y
+CONFIG_MKFS_VFAT=y
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
+CONFIG_HEXDUMP=y
+CONFIG_FEATURE_HEXDUMP_REVERSE=y
+CONFIG_HD=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_LSPCI=y
+CONFIG_LSUSB=y
+CONFIG_MKSWAP=y
+CONFIG_FEATURE_MKSWAP_UUID=y
+CONFIG_MORE=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+# CONFIG_READPROFILE is not set
+CONFIG_RTCWAKE=y
+CONFIG_SCRIPT=y
+CONFIG_SCRIPTREPLAY=y
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
+CONFIG_FEATURE_MTAB_SUPPORT=y
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_BTRFS=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_HFS=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_ROMFS=y
+CONFIG_FEATURE_VOLUMEID_SYSV=y
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+
+#
+# Miscellaneous Utilities
+#
+CONFIG_CONSPY=y
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_FEATURE_LESS_WINCH=y
+CONFIG_FEATURE_LESS_ASK_TERMINAL=y
+CONFIG_FEATURE_LESS_DASHCMD=y
+CONFIG_FEATURE_LESS_LINENUMS=y
+CONFIG_NANDWRITE=y
+CONFIG_NANDDUMP=y
+CONFIG_SETSERIAL=y
+CONFIG_UBIATTACH=y
+CONFIG_UBIDETACH=y
+CONFIG_UBIMKVOL=y
+CONFIG_UBIRMVOL=y
+CONFIG_UBIRSVOL=y
+CONFIG_UBIUPDATEVOL=y
+CONFIG_ADJTIMEX=y
+CONFIG_BBCONFIG=y
+CONFIG_FEATURE_COMPRESS_BBCONFIG=y
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+CONFIG_FEATURE_CHAT_TTY_HIFI=y
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
+CONFIG_FEATURE_CHAT_SEND_ESCAPES=y
+CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y
+CONFIG_FEATURE_CHAT_CLR_ABORT=y
+CONFIG_CHRT=y
+CONFIG_CROND=y
+CONFIG_FEATURE_CROND_D=y
+CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+# CONFIG_CRONTAB is not set
+# CONFIG_DC is not set
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_DEVMEM=y
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+# CONFIG_FBSPLASH is not set
+CONFIG_FLASHCP=y
+CONFIG_FLASH_LOCK=y
+CONFIG_FLASH_UNLOCK=y
+CONFIG_FLASH_ERASEALL=y
+CONFIG_IONICE=y
+# CONFIG_INOTIFYD is not set
+CONFIG_LAST=y
+# CONFIG_FEATURE_LAST_SMALL is not set
+CONFIG_FEATURE_LAST_FANCY=y
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
+CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+CONFIG_MAN=y
+CONFIG_MICROCOM=y
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+CONFIG_RAIDAUTORUN=y
+CONFIG_READAHEAD=y
+# CONFIG_RFKILL is not set
+CONFIG_RUNLEVEL=y
+CONFIG_RX=y
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+CONFIG_TIMEOUT=y
+CONFIG_TTYSIZE=y
+CONFIG_VOLNAME=y
+CONFIG_WALL=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_NAMEIF=y
+CONFIG_FEATURE_NAMEIF_EXTENDED=y
+CONFIG_NBDCLIENT=y
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+CONFIG_NC_110_COMPAT=y
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_WHOIS=y
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_UNIX_LOCAL=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+CONFIG_VERBOSE_RESOLUTION_ERRORS=y
+CONFIG_ARP=y
+CONFIG_ARPING=y
+CONFIG_BRCTL=y
+CONFIG_FEATURE_BRCTL_FANCY=y
+CONFIG_FEATURE_BRCTL_SHOW=y
+# CONFIG_DNSD is not set
+CONFIG_ETHER_WAKE=y
+# CONFIG_FAKEIDENTD is not set
+CONFIG_FTPD=y
+CONFIG_FEATURE_FTP_WRITE=y
+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_RANGES=y
+CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
+CONFIG_FEATURE_HTTPD_SETUID=y
+CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
+CONFIG_FEATURE_HTTPD_AUTH_MD5=y
+CONFIG_FEATURE_HTTPD_CGI=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
+CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
+CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
+CONFIG_FEATURE_HTTPD_PROXY=y
+CONFIG_FEATURE_HTTPD_GZIP=y
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFENSLAVE=y
+CONFIG_IFPLUGD=y
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NETSTAT=y
+CONFIG_FEATURE_NETSTAT_WIDE=y
+CONFIG_FEATURE_NETSTAT_PRG=y
+CONFIG_NSLOOKUP=y
+CONFIG_NTPD=y
+CONFIG_FEATURE_NTPD_SERVER=y
+CONFIG_PSCAN=y
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_TELNETD=y
+CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_FEATURE_TELNETD_INETD_WAIT=y
+CONFIG_TFTP=y
+CONFIG_TFTPD=y
+
+#
+# Common options for tftp/tftpd
+#
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+CONFIG_TFTP_DEBUG=y
+CONFIG_TRACEROUTE=y
+CONFIG_TRACEROUTE6=y
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
+CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
+CONFIG_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
+CONFIG_UDHCPC6=y
+CONFIG_UDHCPD=y
+CONFIG_DHCPRELAY=y
+CONFIG_DUMPLEASES=y
+CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
+CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+CONFIG_FEATURE_UDHCP_PORT=y
+CONFIG_UDHCP_DEBUG=9
+CONFIG_FEATURE_UDHCP_RFC3397=y
+CONFIG_FEATURE_UDHCP_8021Q=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+# CONFIG_UDPSVD is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
+CONFIG_ZCIP=y
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+CONFIG_LPR=y
+CONFIG_LPQ=y
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+CONFIG_POPMAILDIR=y
+CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+CONFIG_SENDMAIL=y
+
+#
+# Process Utilities
+#
+CONFIG_IOSTAT=y
+CONFIG_LSOF=y
+CONFIG_MPSTAT=y
+CONFIG_NMETER=y
+CONFIG_PMAP=y
+CONFIG_POWERTOP=y
+CONFIG_PSTREE=y
+CONFIG_PWDX=y
+# CONFIG_SMEMCAP is not set
+CONFIG_UPTIME=y
+CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_PGREP=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+CONFIG_PKILL=y
+CONFIG_PS=y
+# CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_FEATURE_PS_LONG is not set
+CONFIG_FEATURE_PS_TIME=y
+CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
+CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_SMP_CPU=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOP_SMP_PROCESS=y
+CONFIG_FEATURE_TOPMEM=y
+CONFIG_FEATURE_SHOW_THREADS=y
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_IDLE_TIMEOUT is not set
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+CONFIG_CTTYHACK=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+CONFIG_SH_MATH_SUPPORT_64=y
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+CONFIG_FEATURE_SH_STANDALONE=y
+CONFIG_FEATURE_SH_NOFORK=y
+CONFIG_FEATURE_SH_HISTFILESIZE=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y
Binary files /mnt/oldroot/etc/prelink.cache and /etc/prelink.cache differ
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/prelink.conf /etc/prelink.conf
--- /mnt/oldroot/etc/prelink.conf 2012-08-16 22:53:56.886993394 -0700
+++ /etc/prelink.conf 2012-08-25 13:02:41.172000605 -0700
@@ -22,13 +22,9 @@
-h /usr/lib64/qt4/
-h /usr/lib32/qt4/
-h /usr/lib/qt4/
--h /usr/games/lib64/
--h /usr/games/lib32/
--h /usr/games/lib/
-h /usr/lib32/libstdc++-v3/
-h /opt/bin/
--h /usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3/
--h /usr/games/bin/
+-h /usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4/
-b /usr/lib64/klibc
-b /usr/lib64/libfreebl3.so
-b /usr/lib64/libnssdbm3.so
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/printcap /etc/printcap
--- /mnt/oldroot/etc/printcap 2012-07-30 16:19:22.482320226 -0700
+++ /etc/printcap 2012-08-24 18:45:06.169733874 -0700
@@ -1,4 +1,4 @@
# This file was automatically generated by cupsd(8) from the
# /etc/cups/printers.conf file. All changes to this file
# will be lost.
-Canon_MP530|color inkjet 2-sided:rm=feanub:rp=Canon_MP530:
+Canon_MP530|multifunction:rm=calculate:rp=Canon_MP530:
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/profile.env /etc/profile.env
--- /mnt/oldroot/etc/profile.env 2012-08-16 22:54:04.205993398 -0700
+++ /etc/profile.env 2012-08-25 13:02:41.346000608 -0700
@@ -8,22 +8,21 @@
export GCC_SPECS=''
export GDK_USE_XFT='1'
export GUILE_LOAD_PATH='/usr/share/guile/1.8'
-export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
+export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
export KDE_IS_PRELINKED='1'
export LANG='ru_RU.UTF-8'
export LC_NUMERIC='POSIX'
export LESS='-R -M --shift 5'
export LESSOPEN='|lesspipe %s'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man'
export OPENGL_PROFILE='xorg-x11'
-export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/games/bin'
+export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4'
export PRELINK_PATH_MASK='/usr/lib64/klibc:/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib64/gimp/2.0/plug-ins/hot:/opt/bin/skype'
export QT_GRAPHICSSYSTEM='raster'
export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins'
-export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3'
+export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4'
export SANE_CONFIG_DIR='/etc/sane.d'
export USB_DEVFS_PATH='/dev/bus/usb'
-export VBOX_APP_HOME='/usr/lib64/virtualbox'
export XDG_CONFIG_DIRS='/etc/xdg'
export XDG_DATA_DIRS='/usr/local/share:/usr/share'
export XSESSION='KDE-4'
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/runlevels/default/dbus /etc/runlevels/default/dbus
--- /mnt/oldroot/etc/runlevels/default/dbus 1969-12-31 16:00:00.000000000 -0800
+++ /etc/runlevels/default/dbus 2012-07-25 00:33:51.000000000 -0700
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $
+
+extra_started_commands="reload"
+
+depend() {
+ need localmount
+ after bootmisc
+}
+
+start() {
+ ebegin "Starting D-BUS system messagebus"
+ /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
+
+ # We need to test if /var/run/dbus exists, since script will fail if it does not
+ [ ! -e /var/run/dbus ] && mkdir /var/run/dbus
+
+ start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
+ eend $?
+}
+
+stop() {
+ local retval
+
+ ebegin "Stopping D-BUS system messagebus"
+
+ start-stop-daemon --stop --pidfile /var/run/dbus.pid
+ retval=$?
+
+ eend ${retval}
+
+ [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
+
+ return ${retval}
+}
+
+reload() {
+ local retval
+
+ ebegin "Reloading D-BUS messagebus config"
+
+ /usr/bin/dbus-send --print-reply --system --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig > /dev/null
+ retval=$?
+ eend ${retval}
+ return ${retval}
+}
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/samba/smb.conf /etc/samba/smb.conf
--- /mnt/oldroot/etc/samba/smb.conf 2012-08-02 22:16:10.827581537 -0700
+++ /etc/samba/smb.conf 1969-12-31 16:00:00.000000000 -0800
@@ -1,274 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# For a step to step guide on installing, configuring and using samba,
-# read the Samba-HOWTO-Collection. This may be obtained from:
-# http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
-#
-# Many working examples of smb.conf files can be found in the
-# Samba-Guide which is generated daily and can be downloaded from:
-# http://www.samba.org/samba/docs/Samba-Guide.pdf
-#
-# Any line which starts with a ; (semi-colon) or a # (hash)
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not made any basic syntactic errors.
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
- workgroup = MSHOME
-
-# server string is the equivalent of the NT Description field
- server string = Samba Server
-
-# Security mode. Defines in which mode Samba will operate. Possible
-# values are share, user, server, domain and ads. Most people will want
-# user level security. See the Samba-HOWTO-Collection for details.
- security = user
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-; hosts allow = 192.168.0. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
- load printers = yes
-
-# you may wish to override the location of the printcap file
-; printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-; printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-; printing = cups
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-; guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
- log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
- max log size = 50
-
-# Use password server option only with security = server
-# The argument list may include:
-# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-# password server = *
-; password server =
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-; realm = MY_REALM
-
-# Backend to store user information in. New installations should
-# use either tdbsam or ldapsam. smbpasswd is available for backwards
-# compatibility. tdbsam requires no further configuration. If you're
-# migrating from < samba 3.4, you'll have to convert your old user
-# passwords to the new backend with the command:
-# pdbedit -i smbpasswd:/var/lib/samba/private/smbpasswd -e
-; passdb backend = tdbsam
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-# this line. The included file is read at that point.
-; include = /etc/samba/smb.conf.%m
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-; interfaces = 192.168.12.2/24 192.168.13.2/24
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-; local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-; os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-; domain master = yes
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-; preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for
-# Windows95 workstations.
-; domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-; logon script = %m.bat
-# run a specific logon batch file per username
-; logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-# %L substitutes for this servers netbios name, %U is username
-# You must uncomment the [Profiles] share below
-; logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-; wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-; wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one WINS Server on the network. The default is NO.
-; wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
- dns proxy = no
-
-# These scripts are used on a domain controller or stand-alone
-# machine to add or delete corresponding unix accounts
-; add user script = /usr/sbin/useradd %u
-; add group script = /usr/sbin/groupadd %g
-; add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-; delete user script = /usr/sbin/userdel %u
-; delete user from group script = /usr/sbin/deluser %u %g
-; delete group script = /usr/sbin/groupdel %g
-
-
-#============================ Share Definitions ==============================
-[homes]
- comment = Home Directories
- browseable = no
- writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-; comment = Network Logon Service
-; path = /var/lib/samba/netlogon
-; guest ok = yes
-; writable = no
-; share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-; path = /var/lib/samba/profiles
-; browseable = no
-; guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to
-# specifically define each individual printer
-[printers]
- comment = All Printers
- path = /var/spool/samba
- browseable = no
-# Set public = yes to allow user 'guest account' to print
- guest ok = no
- writable = no
- printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-; comment = Temporary file space
-; path = /tmp
-; read only = no
-; public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-; comment = Public Stuff
-; path = /home/samba
-; public = yes
-; writable = yes
-; printable = no
-; write list = @staff
-
-# Other examples.
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-; comment = Fred's Printer
-; valid users = fred
-; path = /homes/fred
-; printer = freds_printer
-; public = no
-; writable = no
-; printable = yes
-
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-; comment = Fred's Service
-; path = /usr/somewhere/private
-; valid users = fred
-; public = no
-; writable = yes
-; printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-; comment = PC Directories
-; path = /usr/pc/%m
-; public = no
-; writable = yes
-
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-[public]
- path = /home/fean/public
- public = yes
- only guest = yes
- writable = yes
-; printable = no
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-; comment = Mary's and Fred's stuff
-; path = /usr/somewhere/shared
-; valid users = mary fred
-; public = no
-; writable = yes
-; printable = no
-; create mask = 0765
-
-
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/samba/smb.conf.default /etc/samba/smb.conf.default
--- /mnt/oldroot/etc/samba/smb.conf.default 1969-12-31 16:00:00.000000000 -0800
+++ /etc/samba/smb.conf.default 2012-05-03 02:47:21.000000000 -0700
@@ -0,0 +1,274 @@
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options (perhaps too
+# many!) most of which are not shown in this example
+#
+# For a step to step guide on installing, configuring and using samba,
+# read the Samba-HOWTO-Collection. This may be obtained from:
+# http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
+#
+# Many working examples of smb.conf files can be found in the
+# Samba-Guide which is generated daily and can be downloaded from:
+# http://www.samba.org/samba/docs/Samba-Guide.pdf
+#
+# Any line which starts with a ; (semi-colon) or a # (hash)
+# is a comment and is ignored. In this example we will use a #
+# for commentry and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command "testparm"
+# to check that you have not made any basic syntactic errors.
+#
+#======================= Global Settings =====================================
+[global]
+
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
+ workgroup = MYGROUP
+
+# server string is the equivalent of the NT Description field
+ server string = Samba Server
+
+# Security mode. Defines in which mode Samba will operate. Possible
+# values are share, user, server, domain and ads. Most people will want
+# user level security. See the Samba-HOWTO-Collection for details.
+ security = user
+
+# This option is important for security. It allows you to restrict
+# connections to machines which are on your local network. The
+# following example restricts access to two C class networks and
+# the "loopback" interface. For more examples of the syntax see
+# the smb.conf man page
+; hosts allow = 192.168.1. 192.168.2. 127.
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+ load printers = yes
+
+# you may wish to override the location of the printcap file
+; printcap name = /etc/printcap
+
+# on SystemV system setting printcap name to lpstat should allow
+# you to automatically obtain a printer list from the SystemV spool
+# system
+; printcap name = lpstat
+
+# It should not be necessary to specify the print system type unless
+# it is non-standard. Currently supported print systems include:
+# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
+; printing = cups
+
+# Uncomment this if you want a guest account, you must add this to /etc/passwd
+# otherwise the user "nobody" is used
+; guest account = pcguest
+
+# this tells Samba to use a separate log file for each machine
+# that connects
+ log file = /var/log/samba/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+ max log size = 50
+
+# Use password server option only with security = server
+# The argument list may include:
+# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+# password server = *
+; password server =
+
+# Use the realm option only with security = ads
+# Specifies the Active Directory realm the host is part of
+; realm = MY_REALM
+
+# Backend to store user information in. New installations should
+# use either tdbsam or ldapsam. smbpasswd is available for backwards
+# compatibility. tdbsam requires no further configuration. If you're
+# migrating from < samba 3.4, you'll have to convert your old user
+# passwords to the new backend with the command:
+# pdbedit -i smbpasswd:/var/lib/samba/private/smbpasswd -e
+; passdb backend = tdbsam
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting.
+# Note: Consider carefully the location in the configuration file of
+# this line. The included file is read at that point.
+; include = /etc/samba/smb.conf.%m
+
+# Configure Samba to use multiple interfaces
+# If you have multiple network interfaces then you must list them
+# here. See the man page for details.
+; interfaces = 192.168.12.2/24 192.168.13.2/24
+
+# Browser Control Options:
+# set local master to no if you don't want Samba to become a master
+# browser on your network. Otherwise the normal election rules apply
+; local master = no
+
+# OS Level determines the precedence of this server in master browser
+# elections. The default value should be reasonable
+; os level = 33
+
+# Domain Master specifies Samba to be the Domain Master Browser. This
+# allows Samba to collate browse lists between subnets. Don't use this
+# if you already have a Windows NT domain controller doing this job
+; domain master = yes
+
+# Preferred Master causes Samba to force a local browser election on startup
+# and gives it a slightly higher chance of winning the election
+; preferred master = yes
+
+# Enable this if you want Samba to be a domain logon server for
+# Windows95 workstations.
+; domain logons = yes
+
+# if you enable domain logons then you may want a per-machine or
+# per user logon script
+# run a specific logon batch file per workstation (machine)
+; logon script = %m.bat
+# run a specific logon batch file per username
+; logon script = %U.bat
+
+# Where to store roving profiles (only for Win95 and WinNT)
+# %L substitutes for this servers netbios name, %U is username
+# You must uncomment the [Profiles] share below
+; logon path = \\%L\Profiles\%U
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
+; wins support = yes
+
+# WINS Server - Tells the NMBD components of Samba to be a WINS Client
+# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
+; wins server = w.x.y.z
+
+# WINS Proxy - Tells Samba to answer name resolution queries on
+# behalf of a non WINS capable client, for this to work there must be
+# at least one WINS Server on the network. The default is NO.
+; wins proxy = yes
+
+# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
+# via DNS nslookups. The default is NO.
+ dns proxy = no
+
+# These scripts are used on a domain controller or stand-alone
+# machine to add or delete corresponding unix accounts
+; add user script = /usr/sbin/useradd %u
+; add group script = /usr/sbin/groupadd %g
+; add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
+; delete user script = /usr/sbin/userdel %u
+; delete user from group script = /usr/sbin/deluser %u %g
+; delete group script = /usr/sbin/groupdel %g
+
+
+#============================ Share Definitions ==============================
+[homes]
+ comment = Home Directories
+ browseable = no
+ writable = yes
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+; [netlogon]
+; comment = Network Logon Service
+; path = /var/lib/samba/netlogon
+; guest ok = yes
+; writable = no
+; share modes = no
+
+
+# Un-comment the following to provide a specific roving profile share
+# the default is to use the user's home directory
+;[Profiles]
+; path = /var/lib/samba/profiles
+; browseable = no
+; guest ok = yes
+
+
+# NOTE: If you have a BSD-style print system there is no need to
+# specifically define each individual printer
+[printers]
+ comment = All Printers
+ path = /var/spool/samba
+ browseable = no
+# Set public = yes to allow user 'guest account' to print
+ guest ok = no
+ writable = no
+ printable = yes
+
+# This one is useful for people to share files
+;[tmp]
+; comment = Temporary file space
+; path = /tmp
+; read only = no
+; public = yes
+
+# A publicly accessible directory, but read only, except for people in
+# the "staff" group
+;[public]
+; comment = Public Stuff
+; path = /home/samba
+; public = yes
+; writable = yes
+; printable = no
+; write list = @staff
+
+# Other examples.
+#
+# A private printer, usable only by fred. Spool data will be placed in fred's
+# home directory. Note that fred must have write access to the spool directory,
+# wherever it is.
+;[fredsprn]
+; comment = Fred's Printer
+; valid users = fred
+; path = /homes/fred
+; printer = freds_printer
+; public = no
+; writable = no
+; printable = yes
+
+# A private directory, usable only by fred. Note that fred requires write
+# access to the directory.
+;[fredsdir]
+; comment = Fred's Service
+; path = /usr/somewhere/private
+; valid users = fred
+; public = no
+; writable = yes
+; printable = no
+
+# a service which has a different directory for each machine that connects
+# this allows you to tailor configurations to incoming machines. You could
+# also use the %U option to tailor it by user name.
+# The %m gets replaced with the machine name that is connecting.
+;[pchome]
+; comment = PC Directories
+; path = /usr/pc/%m
+; public = no
+; writable = yes
+
+# A publicly accessible directory, read/write to all users. Note that all files
+# created in the directory by users will be owned by the default user, so
+# any user with access can delete any other user's files. Obviously this
+# directory must be writable by the default user. Another user could of course
+# be specified, in which case all files would be owned by that user instead.
+;[public]
+; path = /usr/somewhere/else/public
+; public = yes
+; only guest = yes
+; writable = yes
+; printable = no
+
+# The following two entries demonstrate how to share a directory so that two
+# users can place files there that will be owned by the specific users. In this
+# setup, the directory should be writable by both users and should have the
+# sticky bit set on it to prevent abuse. Obviously this could be extended to
+# as many users as required.
+;[myshare]
+; comment = Mary's and Fred's stuff
+; path = /usr/somewhere/shared
+; valid users = mary fred
+; public = no
+; writable = yes
+; printable = no
+; create mask = 0765
+
+
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/sgml/catalog /etc/sgml/catalog
--- /mnt/oldroot/etc/sgml/catalog 2012-07-30 18:04:01.601676907 -0700
+++ /etc/sgml/catalog 2011-08-17 02:04:11.000000000 -0700
@@ -4,4 +4,3 @@
CATALOG "/etc/sgml/sgml-ent.cat"
CATALOG "/etc/sgml/sgml-docbook.cat"
CATALOG "/etc/sgml/xml-docbook-4.1.2.cat"
-CATALOG "/etc/sgml/xml-docbook-4.4.cat"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/sgml/xml-docbook-4.4.cat /etc/sgml/xml-docbook-4.4.cat
--- /mnt/oldroot/etc/sgml/xml-docbook-4.4.cat 2012-07-30 18:04:01.642697407 -0700
+++ /etc/sgml/xml-docbook-4.4.cat 1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-CATALOG "/etc/sgml/sgml-docbook.cat"
-CATALOG "/usr/share/sgml/docbook/xml-dtd-4.4/docbook.cat"
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/shadow /etc/shadow
--- /mnt/oldroot/etc/shadow 2012-08-08 22:49:42.914314648 -0700
+++ /etc/shadow 2012-08-23 20:42:29.583505290 -0700
@@ -1,4 +1,4 @@
-root:$5$YVkYlR7/$ecq67wvNbkCT/0RlTlNYs//X9gNvCVgIyci/3gCO.M7:15551:0:99999:7:::
+root:$5$YEdcawlJ$1RMZPYZlntNf68.hJ2uoNiGdETck.gYUSWpCSvTAQKA:15576:0:99999:7:::
halt:*:9797:0:::::
operator:*:9797:0:::::
shutdown:*:9797:0:::::
@@ -26,6 +26,4 @@
kdm:!:14937::::::
usbmux:!:15008::::::
vnstat:!:15049::::::
-fean:$5$9eT0hvbr$vnWhnu.JfPEa8dfkwSqk/s1sn/hg6fqsFp..XQ.JV.B:15551:0:99999:7:::
-games:!:15561::::::
-timidity:!:15561::::::
+fean:$5$MaYV4eVA$uwzakuDbjQTRSqyNnkD9Y8YGyQCBVl07P9QDu9c1JWA:15576:0:99999:7:::
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/shadow- /etc/shadow-
--- /mnt/oldroot/etc/shadow- 2012-08-08 22:40:48.000000000 -0700
+++ /etc/shadow- 2012-08-23 20:42:29.583505290 -0700
@@ -1,4 +1,4 @@
-root:$5$YVkYlR7/$ecq67wvNbkCT/0RlTlNYs//X9gNvCVgIyci/3gCO.M7:15551:0:99999:7:::
+root:$5$YEdcawlJ$1RMZPYZlntNf68.hJ2uoNiGdETck.gYUSWpCSvTAQKA:15576:0:99999:7:::
halt:*:9797:0:::::
operator:*:9797:0:::::
shutdown:*:9797:0:::::
@@ -26,5 +26,4 @@
kdm:!:14937::::::
usbmux:!:15008::::::
vnstat:!:15049::::::
-fean:$5$9eT0hvbr$vnWhnu.JfPEa8dfkwSqk/s1sn/hg6fqsFp..XQ.JV.B:15551:0:99999:7:::
-games:!:15561::::::
+fean:$5$MaYV4eVA$uwzakuDbjQTRSqyNnkD9Y8YGyQCBVl07P9QDu9c1JWA:15576:0:99999:7:::
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/snmp/snmpd.conf.example /etc/snmp/snmpd.conf.example
--- /mnt/oldroot/etc/snmp/snmpd.conf.example 2012-06-17 01:53:03.000000000 -0700
+++ /etc/snmp/snmpd.conf.example 2012-08-20 04:34:05.000000000 -0700
@@ -1,408 +1,193 @@
###############################################################################
#
# EXAMPLE.conf:
-# An example configuration file for configuring the ucd-snmp snmpd agent.
+# An example configuration file for configuring the Net-SNMP agent ('snmpd')
+# See the 'snmpd.conf(5)' man page for details
#
-###############################################################################
+# Some entries are deliberately commented out, and will need to be explicitly activated
#
-# This file is intended to only be an example. If, however, you want
-# to use it, it should be placed in /etc/snmp/snmpd.conf.
-# When the snmpd agent starts up, this is where it will look for it.
+###############################################################################
#
-# You might be interested in generating your own snmpd.conf file using
-# the "snmpconf" program (perl script) instead. It's a nice menu
-# based interface to writing well commented configuration files. Try it!
+# AGENT BEHAVIOUR
#
-# Note: This file is automatically generated from EXAMPLE.conf.def.
-# Do NOT read the EXAMPLE.conf.def file! Instead, after you have run
-# configure & make, and then make sure you read the EXAMPLE.conf file
-# instead, as it will tailor itself to your configuration.
-# All lines beginning with a '#' are comments and are intended for you
-# to read. All other lines are configuration commands for the agent.
+# Listen for connections from the local system only
+agentAddress udp:127.0.0.1:161
+# Listen for connections on all interfaces (both IPv4 *and* IPv6)
+#agentAddress udp:161,udp6:[::1]:161
-#
-# PLEASE: read the snmpd.conf(5) manual page as well!
-#
###############################################################################
-# Access Control
-###############################################################################
+#
+# SNMPv3 AUTHENTICATION
+#
+# Note that these particular settings don't actually belong here.
+# They should be copied to the file /var/net-snmp/snmpd.conf
+# and the passwords changed, before being uncommented in that file *only*.
+# Then restart the agent
+
+# createUser authOnlyUser MD5 "remember to change this password"
+# createUser authPrivUser SHA "remember to change this one too" DES
+# createUser internalUser MD5 "this is only ever used internally, but still change the password"
-# YOU SHOULD CHANGE THE "COMMUNITY" TOKEN BELOW TO A NEW KEYWORD ONLY
-# KNOWN AT YOUR SITE. YOU *MUST* CHANGE THE NETWORK TOKEN BELOW TO
-# SOMETHING REFLECTING YOUR LOCAL NETWORK ADDRESS SPACE.
-
-# By far, the most common question I get about the agent is "why won't
-# it work?", when really it should be "how do I configure the agent to
-# allow me to access it?"
-#
-# By default, the agent responds to the "public" community for read
-# only access, if run out of the box without any configuration file in
-# place. The following examples show you other ways of configuring
-# the agent so that you can change the community names, and give
-# yourself write access as well.
-#
-# The following lines change the access permissions of the agent so
-# that the COMMUNITY string provides read-only access to your entire
-# NETWORK (EG: 10.10.10.0/24), and read/write access to only the
-# localhost (127.0.0.1, not its real ipaddress).
-#
-# For more information, read the FAQ as well as the snmpd.conf(5)
-# manual page.
-
-####
-# First, map the community name (COMMUNITY) into a security name
-# (local and mynetwork, depending on where the request is coming
-# from):
-
-# sec.name source community
-com2sec local localhost COMMUNITY
-com2sec mynetwork NETWORK/24 COMMUNITY
-
-####
-# Second, map the security names into group names:
-
-# sec.model sec.name
-group MyRWGroup v1 local
-group MyRWGroup v2c local
-group MyRWGroup usm local
-group MyROGroup v1 mynetwork
-group MyROGroup v2c mynetwork
-group MyROGroup usm mynetwork
-
-####
-# Third, create a view for us to let the groups have rights to:
-
-# incl/excl subtree mask
-view all included .1 80
-
-####
-# Finally, grant the 2 groups access to the 1 view with different
-# write permissions:
-
-# context sec.model sec.level match read write notif
-access MyROGroup "" any noauth exact all none none
-access MyRWGroup "" any noauth exact all all none
+# If you also change the usernames (which might be sensible),
+# then remember to update the other occurances in this example config file to match.
-# -----------------------------------------------------------------------------
###############################################################################
-# System contact information
+#
+# ACCESS CONTROL
#
-# It is also possible to set the sysContact and sysLocation system
-# variables through the snmpd.conf file. **PLEASE NOTE** that setting
-# the value of these objects here makes these objects READ-ONLY
-# (regardless of any access control settings). Any attempt to set the
-# value of an object whose value is given here will fail with an error
-# status of notWritable.
-
-syslocation Right here, right now.
-syscontact Me
-
-# Example output of snmpwalk:
-# % snmpwalk -v 1 -c public localhost system
-# system.sysDescr.0 = "SunOS name sun4c"
-# system.sysObjectID.0 = OID: enterprises.ucdavis.ucdSnmpAgent.sunos4
-# system.sysUpTime.0 = Timeticks: (595637548) 68 days, 22:32:55
-# system.sysContact.0 = "Me "
-# system.sysName.0 = "name"
-# system.sysLocation.0 = "Right here, right now."
-# system.sysServices.0 = 72
-
+ # system + hrSystem groups only
+view systemonly included .1.3.6.1.2.1.1
+view systemonly included .1.3.6.1.2.1.25.1
-# -----------------------------------------------------------------------------
+ # Full access from the local host
+#rocommunity public localhost
+ # Default access to basic system info
+ rocommunity public default -V systemonly
+ # Full access from an example network
+ # Adjust this network address to match your local
+ # settings, change the community string,
+ # and check the 'agentAddress' setting above
+#rocommunity secret 10.0.0.0/16
-###############################################################################
-# Process checks.
-#
-# The following are examples of how to use the agent to check for
-# processes running on the host. The syntax looks something like:
-#
-# proc NAME [MAX=0] [MIN=0]
-#
-# NAME: the name of the process to check for. It must match
-# exactly (ie, http will not find httpd processes).
-# MAX: the maximum number allowed to be running. Defaults to 0.
-# MIN: the minimum number to be running. Defaults to 0.
-
-#
-# Examples:
-#
-
-# Make sure mountd is running
-proc mountd
-
-# Make sure there are no more than 4 ntalkds running, but 0 is ok too.
-proc ntalkd 4
-
-# Make sure at least one sendmail, but less than or equal to 10 are running.
-proc sendmail 10 1
-
-# A snmpwalk of the prTable would look something like this:
-#
-# % snmpwalk -v 1 -c public localhost .1.3.6.1.4.1.2021.2
-# enterprises.ucdavis.procTable.prEntry.prIndex.1 = 1
-# enterprises.ucdavis.procTable.prEntry.prIndex.2 = 2
-# enterprises.ucdavis.procTable.prEntry.prIndex.3 = 3
-# enterprises.ucdavis.procTable.prEntry.prNames.1 = "mountd"
-# enterprises.ucdavis.procTable.prEntry.prNames.2 = "ntalkd"
-# enterprises.ucdavis.procTable.prEntry.prNames.3 = "sendmail"
-# enterprises.ucdavis.procTable.prEntry.prMin.1 = 0
-# enterprises.ucdavis.procTable.prEntry.prMin.2 = 0
-# enterprises.ucdavis.procTable.prEntry.prMin.3 = 1
-# enterprises.ucdavis.procTable.prEntry.prMax.1 = 0
-# enterprises.ucdavis.procTable.prEntry.prMax.2 = 4
-# enterprises.ucdavis.procTable.prEntry.prMax.3 = 10
-# enterprises.ucdavis.procTable.prEntry.prCount.1 = 0
-# enterprises.ucdavis.procTable.prEntry.prCount.2 = 0
-# enterprises.ucdavis.procTable.prEntry.prCount.3 = 1
-# enterprises.ucdavis.procTable.prEntry.prErrorFlag.1 = 1
-# enterprises.ucdavis.procTable.prEntry.prErrorFlag.2 = 0
-# enterprises.ucdavis.procTable.prEntry.prErrorFlag.3 = 0
-# enterprises.ucdavis.procTable.prEntry.prErrMessage.1 = "No mountd process running."
-# enterprises.ucdavis.procTable.prEntry.prErrMessage.2 = ""
-# enterprises.ucdavis.procTable.prEntry.prErrMessage.3 = ""
-# enterprises.ucdavis.procTable.prEntry.prErrFix.1 = 0
-# enterprises.ucdavis.procTable.prEntry.prErrFix.2 = 0
-# enterprises.ucdavis.procTable.prEntry.prErrFix.3 = 0
-#
-# Note that the errorFlag for mountd is set to 1 because one is not
-# running (in this case an rpc.mountd is, but thats not good enough),
-# and the ErrMessage tells you what's wrong. The configuration
-# imposed in the snmpd.conf file is also shown.
-#
-# Special Case: When the min and max numbers are both 0, it assumes
-# you want a max of infinity and a min of 1.
-#
+ # Full read-only access for SNMPv3
+ rouser authOnlyUser
+ # Full write access for encrypted requests
+ # Remember to activate the 'createUser' lines above
+#rwuser authPrivUser priv
+# It's no longer typically necessary to use the full 'com2sec/group/access' configuration
+# r[ou]user and r[ow]community, together with suitable views, should cover most requirements
-# -----------------------------------------------------------------------------
###############################################################################
-# Executables/scripts
-#
-
#
-# You can also have programs run by the agent that return a single
-# line of output and an exit code. Here are two examples.
+# SYSTEM INFORMATION
#
-# exec NAME PROGRAM [ARGS ...]
-#
-# NAME: A generic name.
-# PROGRAM: The program to run. Include the path!
-# ARGS: optional arguments to be passed to the program
-# a simple hello world
-exec echotest /bin/echo hello world
+# Note that setting these values here, results in the corresponding MIB objects being 'read-only'
+# See snmpd.conf(5) for more details
+sysLocation Sitting on the Dock of the Bay
+sysContact Me
+ # Application + End-to-End layers
+sysServices 72
+
-# Run a shell script containing:
-#
-# #!/bin/sh
-# echo hello world
-# echo hi there
-# exit 35
#
-# Note: this has been specifically commented out to prevent
-# accidental security holes due to someone else on your system writing
-# a /tmp/shtest before you do. Uncomment to use it.
+# Process Monitoring
#
-#exec shelltest /bin/sh /tmp/shtest
-
-# Then,
-# % snmpwalk -v 1 -c public localhost .1.3.6.1.4.1.2021.8
-# enterprises.ucdavis.extTable.extEntry.extIndex.1 = 1
-# enterprises.ucdavis.extTable.extEntry.extIndex.2 = 2
-# enterprises.ucdavis.extTable.extEntry.extNames.1 = "echotest"
-# enterprises.ucdavis.extTable.extEntry.extNames.2 = "shelltest"
-# enterprises.ucdavis.extTable.extEntry.extCommand.1 = "/bin/echo hello world"
-# enterprises.ucdavis.extTable.extEntry.extCommand.2 = "/bin/sh /tmp/shtest"
-# enterprises.ucdavis.extTable.extEntry.extResult.1 = 0
-# enterprises.ucdavis.extTable.extEntry.extResult.2 = 35
-# enterprises.ucdavis.extTable.extEntry.extOutput.1 = "hello world."
-# enterprises.ucdavis.extTable.extEntry.extOutput.2 = "hello world."
-# enterprises.ucdavis.extTable.extEntry.extErrFix.1 = 0
-# enterprises.ucdavis.extTable.extEntry.extErrFix.2 = 0
-
-# Note that the second line of the /tmp/shtest shell script is cut
-# off. Also note that the exit status of 35 was returned.
+ # At least one 'mountd' process
+proc mountd
+ # No more than 4 'ntalkd' processes - 0 is OK
+proc ntalkd 4
+ # At least one 'sendmail' process, but no more than 10
+proc sendmail 10 1
-# -----------------------------------------------------------------------------
+# Walk the UCD-SNMP-MIB::prTable to see the resulting output
+# Note that this table will be empty if there are no "proc" entries in the snmpd.conf file
-###############################################################################
-# disk checks
#
-
-# The agent can check the amount of available disk space, and make
-# sure it is above a set limit.
-
-# disk PATH [MIN=DEFDISKMINIMUMSPACE]
+# Disk Monitoring
#
-# PATH: mount path to the disk in question.
-# MIN: Disks with space below this value will have the Mib's errorFlag set.
-# Default value = DEFDISKMINIMUMSPACE.
+ # 10MBs required on root disk, 5% free on /var, 10% free on all other disks
+disk / 10000
+disk /var 5%
+includeAllDisks 10%
-# Check the / partition and make sure it contains at least 10 megs.
+# Walk the UCD-SNMP-MIB::dskTable to see the resulting output
+# Note that this table will be empty if there are no "disk" entries in the snmpd.conf file
-disk / 10000
-# % snmpwalk -v 1 -c public localhost .1.3.6.1.4.1.2021.9
-# enterprises.ucdavis.diskTable.dskEntry.diskIndex.1 = 0
-# enterprises.ucdavis.diskTable.dskEntry.diskPath.1 = "/" Hex: 2F
-# enterprises.ucdavis.diskTable.dskEntry.diskDevice.1 = "/dev/dsk/c201d6s0"
-# enterprises.ucdavis.diskTable.dskEntry.diskMinimum.1 = 10000
-# enterprises.ucdavis.diskTable.dskEntry.diskTotal.1 = 837130
-# enterprises.ucdavis.diskTable.dskEntry.diskAvail.1 = 316325
-# enterprises.ucdavis.diskTable.dskEntry.diskUsed.1 = 437092
-# enterprises.ucdavis.diskTable.dskEntry.diskPercent.1 = 58
-# enterprises.ucdavis.diskTable.dskEntry.diskErrorFlag.1 = 0
-# enterprises.ucdavis.diskTable.dskEntry.diskErrorMsg.1 = ""
+#
+# System Load
+#
+ # Unacceptable 1-, 5-, and 15-minute load averages
+load 12 10 5
+
+# Walk the UCD-SNMP-MIB::laTable to see the resulting output
+# Note that this table *will* be populated, even without a "load" entry in the snmpd.conf file
-# -----------------------------------------------------------------------------
###############################################################################
-# load average checks
#
-
-# load [1MAX=DEFMAXLOADAVE] [5MAX=DEFMAXLOADAVE] [15MAX=DEFMAXLOADAVE]
+# ACTIVE MONITORING
#
-# 1MAX: If the 1 minute load average is above this limit at query
-# time, the errorFlag will be set.
-# 5MAX: Similar, but for 5 min average.
-# 15MAX: Similar, but for 15 min average.
-
-# Check for loads:
-load 12 14 14
-
-# % snmpwalk -v 1 -c public localhost .1.3.6.1.4.1.2021.10
-# enterprises.ucdavis.loadTable.laEntry.loadaveIndex.1 = 1
-# enterprises.ucdavis.loadTable.laEntry.loadaveIndex.2 = 2
-# enterprises.ucdavis.loadTable.laEntry.loadaveIndex.3 = 3
-# enterprises.ucdavis.loadTable.laEntry.loadaveNames.1 = "Load-1"
-# enterprises.ucdavis.loadTable.laEntry.loadaveNames.2 = "Load-5"
-# enterprises.ucdavis.loadTable.laEntry.loadaveNames.3 = "Load-15"
-# enterprises.ucdavis.loadTable.laEntry.loadaveLoad.1 = "0.49" Hex: 30 2E 34 39
-# enterprises.ucdavis.loadTable.laEntry.loadaveLoad.2 = "0.31" Hex: 30 2E 33 31
-# enterprises.ucdavis.loadTable.laEntry.loadaveLoad.3 = "0.26" Hex: 30 2E 32 36
-# enterprises.ucdavis.loadTable.laEntry.loadaveConfig.1 = "12.00"
-# enterprises.ucdavis.loadTable.laEntry.loadaveConfig.2 = "14.00"
-# enterprises.ucdavis.loadTable.laEntry.loadaveConfig.3 = "14.00"
-# enterprises.ucdavis.loadTable.laEntry.loadaveErrorFlag.1 = 0
-# enterprises.ucdavis.loadTable.laEntry.loadaveErrorFlag.2 = 0
-# enterprises.ucdavis.loadTable.laEntry.loadaveErrorFlag.3 = 0
-# enterprises.ucdavis.loadTable.laEntry.loadaveErrMessage.1 = ""
-# enterprises.ucdavis.loadTable.laEntry.loadaveErrMessage.2 = ""
-# enterprises.ucdavis.loadTable.laEntry.loadaveErrMessage.3 = ""
-
-# -----------------------------------------------------------------------------
+ # send SNMPv1 traps
+ trapsink localhost public
+ # send SNMPv2c traps
+#trap2sink localhost public
+ # send SNMPv2c INFORMs
+#informsink localhost public
-###############################################################################
-# Extensible sections.
-#
+# Note that you typically only want *one* of these three lines
+# Uncommenting two (or all three) will result in multiple copies of each notification.
-# This alleviates the multiple line output problem found in the
-# previous executable mib by placing each mib in its own mib table:
-# Run a shell script containing:
#
-# #!/bin/sh
-# echo hello world
-# echo hi there
-# exit 35
-#
-# Note: this has been specifically commented out to prevent
-# accidental security holes due to someone else on your system writing
-# a /tmp/shtest before you do. Uncomment to use it.
-#
-# exec .1.3.6.1.4.1.2021.50 shelltest /bin/sh /tmp/shtest
-
-# % snmpwalk -v 1 -c public localhost .1.3.6.1.4.1.2021.50
-# enterprises.ucdavis.50.1.1 = 1
-# enterprises.ucdavis.50.2.1 = "shelltest"
-# enterprises.ucdavis.50.3.1 = "/bin/sh /tmp/shtest"
-# enterprises.ucdavis.50.100.1 = 35
-# enterprises.ucdavis.50.101.1 = "hello world."
-# enterprises.ucdavis.50.101.2 = "hi there."
-# enterprises.ucdavis.50.102.1 = 0
-
-# Now the Output has grown to two lines, and we can see the 'hi
-# there.' output as the second line from our shell script.
-#
-# Note that you must alter the mib.txt file to be correct if you want
-# the .50.* outputs above to change to reasonable text descriptions.
-
-# Other ideas:
-#
-# exec .1.3.6.1.4.1.2021.51 ps /bin/ps
-# exec .1.3.6.1.4.1.2021.52 top /usr/local/bin/top
-# exec .1.3.6.1.4.1.2021.53 mailq /usr/bin/mailq
+# Event MIB - automatically generate alerts
+#
+ # Remember to activate the 'createUser' lines above
+iquerySecName internalUser
+rouser internalUser
+ # generate traps on UCD error conditions
+defaultMonitors yes
+ # generate traps on linkUp/Down
+linkUpDownNotifications yes
-# -----------------------------------------------------------------------------
###############################################################################
-# Pass through control.
-#
-
-# Usage:
-# pass MIBOID EXEC-COMMAND
#
-# This will pass total control of the mib underneath the MIBOID
-# portion of the mib to the EXEC-COMMAND.
+# EXTENDING THE AGENT
#
-# Note: You'll have to change the path of the passtest script to your
-# source directory or install it in the given location.
-#
-# Example: (see the script for details)
-# (commented out here since it requires that you place the
-# script in the right location. (its not installed by default))
-
-# pass .1.3.6.1.4.1.2021.255 /bin/sh PREFIX/local/passtest
-
-# % snmpwalk -v 1 -c public localhost .1.3.6.1.4.1.2021.255
-# enterprises.ucdavis.255.1 = "life the universe and everything"
-# enterprises.ucdavis.255.2.1 = 42
-# enterprises.ucdavis.255.2.2 = OID: 42.42.42
-# enterprises.ucdavis.255.3 = Timeticks: (363136200) 42 days, 0:42:42
-# enterprises.ucdavis.255.4 = IpAddress: 127.0.0.1
-# enterprises.ucdavis.255.5 = 42
-# enterprises.ucdavis.255.6 = Gauge: 42
-#
-# % snmpget -v 1 -c public localhost .1.3.6.1.4.1.2021.255.5
-# enterprises.ucdavis.255.5 = 42
+
#
-# % snmpset -v 1 -c public localhost .1.3.6.1.4.1.2021.255.1 s "New string"
-# enterprises.ucdavis.255.1 = "New string"
+# Arbitrary extension commands
#
+ extend test1 /bin/echo Hello, world!
+ extend-sh test2 echo Hello, world! ; echo Hi there ; exit 35
+#extend-sh test3 /bin/sh /tmp/shtest
-# For specific usage information, see the man/snmpd.conf.5 manual page
-# as well as the local/passtest script used in the above example.
+# Note that this last entry requires the script '/tmp/shtest' to be created first,
+# containing the same three shell commands, before the line is uncommented
+
+# Walk the NET-SNMP-EXTEND-MIB tables (nsExtendConfigTable, nsExtendOutput1Table
+# and nsExtendOutput2Table) to see the resulting output
+
+# Note that the "extend" directive supercedes the previous "exec" and "sh" directives
+# However, walking the UCD-SNMP-MIB::extTable should still returns the same output,
+# as well as the fuller results in the above tables.
-###############################################################################
-# Subagent control
-#
-# The agent can support subagents using a number of extension mechanisms.
-# From the 4.2.1 release, AgentX support is being compiled in by default.
-# To use this mechanism, simply uncomment the following directive.
-#
-# master agentx
#
-# Please see the file README.agentx for more details.
+# "Pass-through" MIB extension command
#
+#pass .1.3.6.1.4.1.8072.2.255 /bin/sh PREFIX/local/passtest
+#pass .1.3.6.1.4.1.8072.2.255 /usr/bin/perl PREFIX/local/passtest.pl
+# Note that this requires one of the two 'passtest' scripts to be installed first,
+# before the appropriate line is uncommented.
+# These scripts can be found in the 'local' directory of the source distribution,
+# and are not installed automatically.
-###############################################################################
-# Further Information
+# Walk the NET-SNMP-PASS-MIB::netSnmpPassExamples subtree to see the resulting output
+
+
+#
+# AgentX Sub-agents
#
-# See the snmpd.conf manual page, and the output of "snmpd -H".
-# MUCH more can be done with the snmpd.conf than is shown as an
-# example here.
+ # Run as an AgentX master agent
+ master agentx
+ # Listen for network connections (from localhost)
+ # rather than the default named socket /var/agentx/master
+#agentXSocket tcp:localhost:705
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ssh/ssh_config /etc/ssh/ssh_config
--- /mnt/oldroot/etc/ssh/ssh_config 2012-07-29 23:40:51.602530270 -0700
+++ /etc/ssh/ssh_config 2012-08-23 22:41:39.003465770 -0700
@@ -1,54 +1 @@
-#------------------------------------------------------------------------------
-# Modified Calculate-install 3.0.0
-# Processed template files:
-# /var/lib/layman/calculate/profiles/templates/install-3.0/1live/openssh/ssh/ssh_config
-# For modify this file, create /etc/ssh/ssh_config.clt template.
-#------------------------------------------------------------------------------
-# $OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $
-
-# This is the ssh client system-wide configuration file. See
-# ssh_config(5) for more information. This file provides defaults for
-# users, and the values can be changed in per-user configuration files
-# or on the command line.
-
-# Configuration data is parsed as follows:
-# 1. command line options
-# 2. user-specific file
-# 3. system-wide file
-# Any configuration value is only changed the first time it is set.
-# Thus, host-specific definitions should be at the beginning of the
-# configuration file, and defaults at the end.
-
-# Site-wide defaults for some commonly used options. For a comprehensive
-# list of available options, their meanings and defaults, please see the
-# ssh_config(5) man page.
-
-# Host *
-# ForwardAgent no
-# ForwardX11 no
-# RhostsRSAAuthentication no
-# RSAAuthentication yes
-# PasswordAuthentication yes
-# HostbasedAuthentication no
-# GSSAPIAuthentication no
-# GSSAPIDelegateCredentials no
-# BatchMode no
-# CheckHostIP yes
-# AddressFamily any
-# ConnectTimeout 0
-# StrictHostKeyChecking ask
-# IdentityFile ~/.ssh/identity
-# IdentityFile ~/.ssh/id_rsa
-# IdentityFile ~/.ssh/id_dsa
-# Port 22
-# Protocol 2,1
-# Cipher 3des
-# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
-# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
-# EscapeChar ~
-# Tunnel no
-# TunnelDevice any:any
-# PermitLocalCommand no
-# VisualHostKey no
-# ProxyCommand ssh -q -W %h:%p gateway.example.com
-SendEnv LANG LC_*
+StrictHostKeyChecking=no
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key
--- /mnt/oldroot/etc/ssh/ssh_host_dsa_key 2012-07-30 00:01:31.551000424 -0700
+++ /etc/ssh/ssh_host_dsa_key 2012-08-23 20:49:29.756000014 -0700
@@ -1,12 +1,12 @@
-----BEGIN DSA PRIVATE KEY-----
-6xTutLM1RoevF3ieCozTMrPLxGVa9SG/b5UTcd9DAQGd6u4MYKIZDAh8AhRaSMWk
-x07JymULhizSqukCVV1DCQ==
+MIIBugIBAAKBgQDguAnvbh3CgCO0pYfwm5wSNJq5EPdz6jqCp7QtbdVbOvVpIjno
+out9jTZ0vLRl4G4ZKOJR0GBHqqYpWIVlFu277syG9fQgKUeqsXUgPy5ni23dIoMR
NWG5l1E6wPdzVur9ulFIvFrCsz
+NRoRAO/u6Za0q+L8/akL2D0UeKS7LxAlQ/ux+pd+hC8xBrz6/PMKbgIUBEk+Wo0p
+qrsASBzjfCFFU+x9J54=
-----END DSA PRIVATE KEY-----
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ssh/ssh_host_dsa_key.pub /etc/ssh/ssh_host_dsa_key.pub
--- /mnt/oldroot/etc/ssh/ssh_host_dsa_key.pub 2012-07-30 00:01:31.551000424 -0700
+++ /etc/ssh/ssh_host_dsa_key.pub 2012-08-23 20:49:29.756000014 -0700
@@ -1 +1 @@
-ssh-dss AAAAB3NzaC1kc3MAAACBAPk6Y7jczOkzQuUNstiCywAsuk2/oXiZHX+xDRUZ0Nu/mWqb4VCDEVvOXk6R30qQusfERmzsjGuz3gUx7ptWsq+Xa2tWkieIEImFgWWbqPJPNs1QnPrXxgpferX4SRcfPBrhFCcdLUS1dh7U0G1Ho5prRn2vCIS7gUwpjK5sDMW/AAAAFQCMqsmHhVxR0dcwGLTVXw3eUoyuYwAAAIEA7uN1CuJ3vs4dSqEIA8lIUFBU8/YWtrU9qp5cpCN9Nbn02UCc+ITe7v0nq1sJBrAmmMbsMRD0j6d5EgXC/6ez6ivWwaG2n6/HFg1t23EP1saHsXYdsJfDDG6DvKWxof7mCAVi7G08Djr5dh9le23pZ2ZEc1tIslAyaLhvm9s2xoEAAACBANZgz1kSj1dZ+v9brPs6KrdW9u6gzkLECkVbw1Bx0nFIWIOv0FiI6CcZxGfGrIgEU0SLXARqLNMoCCyXVUmKZYbCiA4l01kBtJokVd2tH3LQ7m16iba+6xTutLM1RoevF3ieCozTMrPLxGVa9SG/b5UTcd9DAQGd6u4MYKIZDAh8 root@feanub
+ssh-dss AAAAB3NzaC1kc3MAAACBAOC4Ce9uHcKAI7Slh/CbnBI0mrkQ93PqOoKntC1t1Vs69WkiOeii632NNnS8tGXgbhko4lHQYEeqpilYhWUW7bvuzIb19CApR6qxdSA/LmeLbd0igxFQODKlNr7rWbv4LzY/Yeez9WlDzxDfpFUrnybEczUdpyV+4zf1cioM90y5AAAAFQD8nGQQPePXaSxe03ubj2h1BXkSsQAAAIA1M41Gm6lNAUAQ2VMFwypnTgragkHGxsQwwIhvbU7XqMqooLo+wxy6zZmCP7h6BuNCtWOA+xd3CEaDM0voFy6Ju9UlxRLKqLAGcHFDBeGACw5AV0PBR0fJw7/FtfofsWtNhO5T6RDuRrVb8yTPKcZOp8eXbbYMPWnG+cq/PdaeLgAAAIASuVMotUPGckj/kPoIvqjNgEWo8QYKQrNPj0wN3E4hTA80QxxyTeLt/k5rIXyoPsw1jQQymZhFmfmLFVhlcf3iFFkYN0NWG5l1E6wPdzVur9ulFIvFrCszNRoRAO/u6Za0q+L8/akL2D0UeKS7LxAlQ/ux+pd+hC8xBrz6/PMKbg== root@calculate
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key
--- /mnt/oldroot/etc/ssh/ssh_host_ecdsa_key 2012-07-30 00:01:31.971000430 -0700
+++ /etc/ssh/ssh_host_ecdsa_key 2012-08-23 20:49:30.337000014 -0700
@@ -1,5 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
-MHc39patZbVXzIRxlICgCLP4Bp
-TcMbumcHu2K9AUVmJG8jTobFhjEeqWSNsQ==
+MH3
+lAlWx+cPTuiygjUbieGzv+WRIe66IN8igA==
-----END EC PRIVATE KEY-----
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ssh/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub
--- /mnt/oldroot/etc/ssh/ssh_host_ecdsa_key.pub 2012-07-30 00:01:31.971000430 -0700
+++ /etc/ssh/ssh_host_ecdsa_key.pub 2012-08-23 20:49:30.337000014 -0700
@@ -1 +1 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDPevPXQLqqHPh0WzTHfyqeeOxAfmcN/aWrWW1V8yEcZSAoAiz+AaU3DG7pnB7tivQFFZiRvI06GxYYxHqlkjbE= root@feanub
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMlFRLYiquzVQNXjE/N4gLmludPwgXstDmo9bE20D6+mSi0hFvpVd5QJVsfnD07osoI1G4nhs7/lkSHuuiDfIoA= root@calculate
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key
--- /mnt/oldroot/etc/ssh/ssh_host_rsa_key 2012-07-30 00:01:31.959000430 -0700
+++ /etc/ssh/ssh_host_rsa_key 2012-08-23 20:49:30.324000014 -0700
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-jwwzbppV+K1qYAdKG
-4h8Ps99UDacdiy2XXJsLOBsGmDV1ENI/frJkecvKD5mdODcyJCXog38cOTYt2+Bu
-iPGjPxzaAV7Fmcg7+KcMclQFPwH/ojX9SkWSLT61YqJyeyQM1JltgTW19jwoF9mj
-ZJ+SEQKBgD4ljWiNQ4FGwPPUHaMZ84dVOMX7Xxewhb2Qx6YBZ89HFjIqfU2in1v8
-hebzPr54w43NAsMXzHAsfOaJH+Gqrg/of2Jl74Be/+/XE2lV7qXI4xgYUNQAEBL5
-++VQvpXWe8LUcVXUas3LutQwmJjIP+TOAsfnK+RpdgO/Mkq28Vly
+MIIEpgIBAAKCAQEAvOUl2zOW60ej5CwJAbZNuX3jzf0FajD7tLlqWIF0grl8pyfZ
+5Q1llUNZLiBaFjLR1uQnU4Rh0Un/xTYW2mj/FjK/qfMUPZBpveP1zR5kMBU761RP
+499KR0lPX63j0Mzm7vL6oudmq3D7XAzSYklkNrWfR55v7x9Acvr6XOik1NciXmKo
+eIm91Z08f+TMS3RbxS3duJfSqzjjpzyuuT8n3HAuJHWDfsV/MkYYHuZRBAZZNkmK
+tdfyn/cprcr
+5BWpjSe5AoGBAJQv19I52Z4mN5AlBrqhTAH2p7O/CDRdEuojFJELjStY0tciGfKT
+jdZfnIeYpTnr+4YGK4e6DTU48u93uuhZjyoLDaU+VWKip7wlnZrxRQsi581g9qBu
+mpCnVJdhdFzuhcOciuRq1EKoadFLdxovuM11kYg0500KnCOHrdN0GNPp
-----END RSA PRIVATE KEY-----
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/ssh/ssh_host_rsa_key.pub /etc/ssh/ssh_host_rsa_key.pub
--- /mnt/oldroot/etc/ssh/ssh_host_rsa_key.pub 2012-07-30 00:01:31.959000430 -0700
+++ /etc/ssh/ssh_host_rsa_key.pub 2012-08-23 20:49:30.325000014 -0700
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2uXynJ9nlDWWVQ1kuIFoWMtHNJiSWQ2tZ9Hnm/vH0By+vpc6KTU1yJeYqh4ib3VnTx/5MxLdFvFLd24l9KrOOOnPK65PyfccC4kdYN+xX8yRhge5lEEBlk2SYq13cA9W2Gyrn9YhgAajO13Edbk2OlcOk6M7jHShvINk0yzmuccHxl01Uo4OsWZ02TFwTLb5XvCWbQ2NolWcBdpa53LmDCLKwtlJHS3 root@calculate
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/timidity.cfg /etc/timidity.cfg
--- /mnt/oldroot/etc/timidity.cfg 2012-08-08 22:50:37.000000000 -0700
+++ /etc/timidity.cfg 1969-12-31 16:00:00.000000000 -0800
@@ -1,24 +0,0 @@
-##############################################################################
-#
-# timidity-update core configuration file
-#
-# Easy process:
-#
-# 1. Change directory to patch directory
-# 2. Source current/timidity.cfg
-#
-# Current patch set will always be symlinked to current, so make sure that the
-# proper timidity.cfg is in there
-#
-#
-# - source /usr/share/timidity
-# - source ~/.timidity/current
-# - Make ~/.timidity/current point to the current patch set, or to whatever
-# the individual user sets
-# - If ~/.timidity/current isn't found, it will try
-# /usr/share/timidity/current
-#
-
-dir /usr/share/timidity
-dir ~/.timidity
-source current/timidity.cfg
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/udev/rules.d/70-persistent-net.rules /etc/udev/rules.d/70-persistent-net.rules
--- /mnt/oldroot/etc/udev/rules.d/70-persistent-net.rules 2012-07-29 23:40:17.315530253 -0700
+++ /etc/udev/rules.d/70-persistent-net.rules 2012-08-23 20:41:46.570504551 -0700
@@ -1,6 +1,3 @@
-
-# PCI device 0x10ec:0x8168 (r8169)
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:24:8c:bf:14:ac", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"
# This file was automatically generated by the /lib/udev/write_net_rules
# program, run by the persistent-net-generator.rules rules file.
#
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/vbox/vbox.cfg /etc/vbox/vbox.cfg
--- /mnt/oldroot/etc/vbox/vbox.cfg 2012-08-13 13:03:28.000000000 -0700
+++ /etc/vbox/vbox.cfg 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-INSTALL_DIR=/usr/lib64/virtualbox
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/xml/catalog /etc/xml/catalog
--- /mnt/oldroot/etc/xml/catalog 2012-07-30 18:04:00.860306407 -0700
+++ /etc/xml/catalog 2011-12-04 21:58:42.000000000 -0800
@@ -2,8 +2,6 @@
-
-
diff -x /etc/ssh -x /etc/shadow -x /etc/passwd -x /etc/group -ruN /mnt/oldroot/etc/xml/docbook /etc/xml/docbook
--- /mnt/oldroot/etc/xml/docbook 2012-07-30 18:04:01.517634907 -0700
+++ /etc/xml/docbook 2011-12-04 21:58:42.000000000 -0800
@@ -59,13 +59,4 @@
-
-
-
-
-
-
-
-
-