From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.2.5 From: "Michael A. Kangin" To: ALT Linux Team development discussions In-Reply-To: <4F1EB814.4010104@altlinux.com> References: <1327398280.20810.5@ildar.innovations.kz> <4F1EB814.4010104@altlinux.com> Content-Type: multipart/mixed; boundary="=-2hFLFu0lgkW4RMgvRQu2" Date: Thu, 26 Jan 2012 02:03:39 +0400 Message-ID: <1327529019.6926.10.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.32.3 (2.32.3-alt2) Subject: Re: [devel] =?koi8-r?b?UmVzY3VlLc/C0sHaINcgyc7T1MHM0dTP0sUgKyBSZXNj?= =?koi8-r?b?dWUtxMnTyyAo0NLPxcvUKQ==?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2012 22:03:50 -0000 Archived-At: List-Archive: List-Post: --=-2hFLFu0lgkW4RMgvRQu2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 0JIg0JLRgtGALCAyNC8wMS8yMDEyINCyIDE3OjU0ICswNDAwLCBBbnRvbiBGYXJ5Z2luINC/0LjR iNC10YI6DQoNCj4gPiAx0LAuINCYINCyINGC0L7QvCDRh9C40YHQu9C1INCyIExpdmVDRCDQmtC1 0L3RgtCw0LLRgNCwDQo+ID4gMi4g0JXRgdGC0Ywg0LvQuCDQttC10LvQsNGO0YnQuNC1ICLQtNC+ 0L/QuNC90LDRgtGMIiDQv9GA0L7QtdC60YIg0L7RgtC00LXQu9GM0L3QvtCz0L4g0LfQsNCz0YDR g9C30L7Rh9C90L7Qs9C+INC00LjRgdC60LA/DQo+IA0KPiDQntGC0LTQtdC70YzQvdC+0LPQviDQ vdC1INGF0L7Rh9GDLiDQpdC+0YfRgyDRh9GC0L4g0LEg0LLQtdC30LTQtSA7KQ0KDQrQktC+0LjR gdGC0LjQvdGDIDopDQoNCtCvINGB0LLQvtC5INGI0LLQtdC50YbQsNGA0YHQutC40Lkg0L3QvtC2 0LjQuiDRgdC00LXQu9Cw0Lsg0LjQtyDQstCw0YjQtdCz0L4g0L/RgNC+0YTQuNC70Y8sINC00LjR hNGEINC90LAg0LLRgdGP0LrQuNC5INGB0LvRg9GH0LDQuQ0K0LIg0LDRgtGC0LDRh9C1Lg0KDQrQ mCwg0LrRgdGC0LDRgtC4LCDQutC+0LzRgyDQuNC90YLQtdGA0LXRgdC90L46IA0KZnRwOi8vczAw MjEuaXB0cC5uZXQvcHViL211bHRpYm9vdC5pbWcNCjTQk9CxINC+0LHRgNCw0LcgbGl2ZS3RhNC7 0LXRiNC60LguDQrQodC+0YHRgtCw0LI6DQp4ODZfNjQ6IEFMVCBDZW50YXVydXMsIEFMVCBSZXNj dWUsIEZlZG9yYSAxNiwgVWJ1bnR1IDExLjEwDQppNTg2OiBBTFQgU2ltcGx5LCBBTFQgUmVzY3Vl LCBGcmVlQlNEIDguMSBGcmVuenkNCm90aGVyOiBGcmVlRE9TLCBnUFhFIGFnZW50LCBIYXJkd2Fy ZSBEZXRlY3Rpb24gVG9vbCwgbWVtdGVzdC4NCg0KLS0gDQp3YnIsIE1pY2hhZWwgQS4gS2FuZ2lu DQo= --=-2hFLFu0lgkW4RMgvRQu2 Content-Disposition: attachment; filename="rescue.diff" Content-Type: text/x-patch; name="rescue.diff"; charset="UTF-8" Content-Transfer-Encoding: 7bit diff --git a/profiles/pkg/lists/rescue.in b/profiles/pkg/lists/rescue.in index 5812f8f..3b89c7b 100644 --- a/profiles/pkg/lists/rescue.in +++ b/profiles/pkg/lists/rescue.in @@ -22,10 +22,15 @@ man-pages sysfsutils sysklogd util-linux +apt-conf-@APTCONF_PACKAGE@ +apt + ### CPU utils cpuburn x86info +htop +iotop ### Disk utils bonnie++ @@ -57,6 +62,7 @@ shadow-suite sharutils time openssl +syslinux ### Applications/Archiving arj @@ -65,6 +71,7 @@ gzip unrar unzip zip +p7zip ### Applications/Editors vim-console @@ -101,6 +108,7 @@ ipset iputils lftp mailx +minicom netcat netlist nfs-utils diff --git a/profiles/rescue/image-scripts.d/003adjtime b/profiles/rescue/image-scripts.d/003adjtime index ef91a8d..f6344d9 100755 --- a/profiles/rescue/image-scripts.d/003adjtime +++ b/profiles/rescue/image-scripts.d/003adjtime @@ -4,4 +4,4 @@ # clean resolv.conf and hosts /bin/echo "127.0.0.1 localhost" > /etc/hosts -/bin/echo > /etc/resolv.conf +/bin/echo "nameserver 8.8.8.8" > /etc/resolv.conf diff --git a/profiles/rescue/image-scripts.d/998usr-rw b/profiles/rescue/image-scripts.d/998usr-rw new file mode 100755 index 0000000..13b8fea --- /dev/null +++ b/profiles/rescue/image-scripts.d/998usr-rw @@ -0,0 +1,3 @@ +#!/bin/sh + +sed -i -e 's|\(for mpoint in\)|\1 /usr|' /etc/rc.d/rc.sysinit.rescue diff --git a/profiles/rescue/image-scripts.d/999system b/profiles/rescue/image-scripts.d/999system index 6d939ef..136c91b 100755 --- a/profiles/rescue/image-scripts.d/999system +++ b/profiles/rescue/image-scripts.d/999system @@ -15,10 +15,10 @@ rm -rf /usr/share/icons rm -rf /lib/modules/*/kernel/drivers/atm rm -rf /lib/modules/*/kernel/drivers/char/watchdog -rm -rf /lib/modules/*/kernel/drivers/cpufreq +#rm -rf /lib/modules/*/kernel/drivers/cpufreq rm -rf /lib/modules/*/kernel/drivers/edac -rm -rf /lib/modules/*/kernel/drivers/firmware -rm -rf /lib/modules/*/kernel/drivers/hwmon +#rm -rf /lib/modules/*/kernel/drivers/firmware +#rm -rf /lib/modules/*/kernel/drivers/hwmon rm -rf /lib/modules/*/kernel/drivers/infiniband rm -rf /lib/modules/*/kernel/drivers/input/{gameport,joy*} rm -rf /lib/modules/*/kernel/drivers/isdn @@ -32,8 +32,8 @@ rm -rf /lib/modules/*/kernel/drivers/telephony rm -rf /lib/modules/*/kernel/drivers/usb/{misc,mon} rm -rf /lib/modules/*/kernel/drivers/video rm -rf /lib/modules/*/kernel/drivers/w1 -rm -rf /lib/modules/*/kernel/net/*/netfilter -rm -rf /lib/modules/*/kernel/net/netfilter +#rm -rf /lib/modules/*/kernel/net/*/netfilter +#rm -rf /lib/modules/*/kernel/net/netfilter rm -rf /lib/modules/*/kernel/sound # remove blacklisted kernel modules @@ -43,10 +43,12 @@ sed -n 's/^blacklist[[:space:]]\+\([^[:space:]]\+\).*/\1/p' /etc/modprobe.d/* | done # remove rpm db -rm -rf /var/lib/rpm/* +#rm -rf /var/lib/rpm/* # remove apt data files -rm -rf /var/cache/apt /var/lib*/apt +#rm -rf /var/cache/apt/* +#rm -f /var/lib/apt/lists/* +#rm -f /var/lib/apt/prefetch/* # remove unneeded translations $host_find /usr/share/locale/ -type f -delete diff --git a/profiles/rescue/scripts.d/99apt b/profiles/rescue/scripts.d/99apt new file mode 100755 index 0000000..debd11b --- /dev/null +++ b/profiles/rescue/scripts.d/99apt @@ -0,0 +1,2 @@ +#!/bin/bash +sed -i -e 's/#\(.*ftp.*branch.*\)/\1/' $WORKDIR/etc/apt/sources.list.d/yandex.list --=-2hFLFu0lgkW4RMgvRQu2--