r61861 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r61860‎ | r61861 | r61862 >
Date:16:18, 2 February 2010
Author:mark
Status:deferred
Tags:
Comment:
Karmic and new Squids support
Modified paths:
  • /trunk/ubuntu/autoinstall/common.cfg (modified) (history)
  • /trunk/ubuntu/autoinstall/partman_early_command (added) (history)
  • /trunk/ubuntu/autoinstall/raid1.cfg (modified) (history)
  • /trunk/ubuntu/autoinstall/scripts/partman_early_command (modified) (history)
  • /trunk/ubuntu/autoinstall/squid-raid1.cfg (added) (history)

Diff [purge]

Index: trunk/ubuntu/autoinstall/squid-raid1.cfg
@@ -0,0 +1,38 @@
 2+# Automatic software RAID partitioning
 3+
 4+d-i partman-auto/method string raid
 5+
 6+# Use the first two disks
 7+d-i partman-auto/disk string /dev/sda /dev/sdb
 8+
 9+# Define physical partitions
 10+d-i partman-auto/expert_recipe string \
 11+ multiraid :: \
 12+ 5000 8000 10000 raid \
 13+ $primary{ } method { raid } \
 14+ . \
 15+ 1000 1000 1000 raid \
 16+ $primary{ } method { raid } \
 17+ . \
 18+ 64 1000 10000000 linux-swap \
 19+ method { keep } \
 20+ .
 21+
 22+# Parameters are:
 23+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
 24+# <devices> <sparedevices>
 25+d-i partman-auto-raid/recipe string \
 26+ 1 2 0 ext4 / \
 27+ /dev/sda1#/dev/sdb1 \
 28+ . \
 29+ 1 2 0 swap - \
 30+ /dev/sda2#/dev/sdb2 \
 31+ .
 32+
 33+d-i partman-md/confirm boolean true
 34+d-i partman-md/device_remove_md boolean true
 35+d-i partman/confirm_write_new_label boolean true
 36+d-i partman/choose_partition select finish
 37+d-i partman/confirm boolean true
 38+
 39+d-i mdadm/boot_degraded boolean true
Index: trunk/ubuntu/autoinstall/common.cfg
@@ -9,6 +9,7 @@
1010
1111 d-i grub-installer/only_debian boolean true
1212 d-i grub-installer/with_other_os boolean true
 13+d-i grub-installer/grub2_instead_of_grub_legacy boolean false
1314 d-i grub-installer/bootdev string /dev/sda
1415
1516 # Avoid that last message about the install being complete.
Index: trunk/ubuntu/autoinstall/scripts/partman_early_command
@@ -6,5 +6,5 @@
77 # Karmic has a bug with grub 2 and serial consoles
88 SUITE=$(debconf-get mirror/suite)
99 if [ "$SUITE" = "karmic" ]; then
10 - sed -i /usr/bin/grub-installer 's/`grub_serial_console`/`grub_serial_console $serial`/g'
 10+ sed -i /usr/bin/grub-installer -e 's/`grub_serial_console`/`grub_serial_console $serial`/g'
1111 fi
Index: trunk/ubuntu/autoinstall/partman_early_command
@@ -0,0 +1,10 @@
 2+#! /bin/sh
 3+
 4+set -e
 5+set -x
 6+
 7+# Karmic has a bug with grub 2 and serial consoles
 8+SUITE=$(debconf-get mirror/suite)
 9+if [ "$SUITE" = "karmic" ]; then
 10+ sed -i /usr/bin/grub-installer -e 's/`grub_serial_console`/`grub_serial_console $serial`/g'
 11+fi
Index: trunk/ubuntu/autoinstall/raid1.cfg
@@ -33,6 +33,7 @@
3434 .
3535
3636 d-i partman-md/confirm boolean true
 37+d-i partman-md/device_remove_md boolean true
3738 d-i partman/confirm_write_new_label boolean true
3839 d-i partman/choose_partition select finish
3940 d-i partman/confirm boolean true

Status & tagging log