diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-09-03 11:22:22 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-09-03 11:22:22 +0000 |
| commit | 72c4f23462979493fb161c82b5811d8629c152a6 (patch) | |
| tree | f6bf7a3e471e52c922b0b0a0546ccb82b1b83786 | |
| parent | 7b3da68aeba9ca29304202e72dc03ae8216e73be (diff) | |
| download | drakx-72c4f23462979493fb161c82b5811d8629c152a6.tar drakx-72c4f23462979493fb161c82b5811d8629c152a6.tar.gz drakx-72c4f23462979493fb161c82b5811d8629c152a6.tar.bz2 drakx-72c4f23462979493fb161c82b5811d8629c152a6.tar.xz drakx-72c4f23462979493fb161c82b5811d8629c152a6.zip | |
drop KA support
rationale:
- support is not build in stage1,
- hasn't been tested for ages
- poor doc
- can been restored if someone show up to maintain
| -rw-r--r-- | rescue/NEWS | 1 | ||||
| -rw-r--r-- | rescue/list.xml | 23 | ||||
| -rwxr-xr-x | rescue/tree/etc/rc.sysinit | 10 |
3 files changed, 1 insertions, 33 deletions
diff --git a/rescue/NEWS b/rescue/NEWS index e7fe71753..2e57c5bd9 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -2,6 +2,7 @@ - adapt to perl-5.16.0 - adapt to /usr move - default to the higher version when there're several mga roots (mga#6003) +- drop KA support - fix detecting USB devices with kernel-3.5+ (mga#7248) - preload load btrfs and nilfs2 too - rely on stage1 for mounting /dev diff --git a/rescue/list.xml b/rescue/list.xml index cac1fd910..3bf73d1fa 100644 --- a/rescue/list.xml +++ b/rescue/list.xml @@ -339,29 +339,6 @@ dhcp-client </to> </from> -<from dir="/usr/bin"> - <to dir="/ka"> - bootable_flag.sh - fdisk_to_desc - gen_modprobe_conf.pl - ka-d-client - ka-d-server - ka-d.sh - ka_replication.sh - make_initrd_grub - make_initrd_lilo - prepare_node.sh - send_status.pl - status_node.pl - store_log.sh - udev_creation.sh - </to> -</from> -<from dir="/etc/ka"> - <to dir="/ka"> - replication.conf - </to> -</from> <from dir="."> <to dir="/usr/sbin"> diskdrake-resize diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit index f514f9f09..e22696e78 100755 --- a/rescue/tree/etc/rc.sysinit +++ b/rescue/tree/etc/rc.sysinit @@ -2,7 +2,6 @@ action() { echo $1; shift; $*; } DATE=`date +%Y%m%d-%Hh%M` -KADIR="/ka2" export PATH=/bin:/sbin:/usr/bin:/usr/sbin @@ -81,15 +80,6 @@ elif grep -q oem /proc/cmdline; then /tmp/image/oem-rescue.sh elif grep -q restore /proc/cmdline; then /usr/sbin/restore-image.sh -elif grep -q kamethod /proc/cmdline; then - echo "Welcome to Ka" - drvinst - ln -sf /tmp/stage2/ka $KADIR - ln -sf /tmp/stage2/disk /disk - cd $KADIR - echo "-------- Starting LOG server -------------" - perl send_status.pl > /tmp/kacmd & - exec ./ka_replication.sh > /tmp/ka_log-$HOSTNAME-$DATE 2>&1 elif ! grep -q expert /proc/cmdline; then echo "starting GUI" rescue-gui |