Re: [devel] Rescue-образ в инсталяторе + Rescue-диск (проект)

["Michael A. Kangin" <mak@complife.ru>]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

В Втр, 24/01/2012 в 17:54 +0400, Anton Farygin пишет:

> > 1а. И в том числе в LiveCD Кентавра
> > 2. Есть ли желающие "допинать" проект отдельного загрузочного диска?
> 
> Отдельного не хочу. Хочу что б везде ;)

Воистину :)

Я свой швейцарский ножик сделал из вашего профиля, дифф на всякий случай
в аттаче.

И, кстати, кому интересно: 
ftp://s0021.iptp.net/pub/multiboot.img
4Гб образ live-флешки.
Состав:
x86_64: ALT Centaurus, ALT Rescue, Fedora 16, Ubuntu 11.10
i586: ALT Simply, ALT Rescue, FreeBSD 8.1 Frenzy
other: FreeDOS, gPXE agent, Hardware Detection Tool, memtest.

-- 
wbr, Michael A. Kangin

[-- Attachment #2: rescue.diff --]
[-- Type: text/x-patch, Size: 3325 bytes --]

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