diff --git a/driver/user_mode_linux/config-uml b/driver/user_mode_linux/config-uml index 3375bbc2c..a0680218d 100644 --- a/driver/user_mode_linux/config-uml +++ b/driver/user_mode_linux/config-uml @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_USERMODE=y # CONFIG_ISA is not set @@ -22,7 +22,8 @@ CONFIG_MD=y # CONFIG_MD_RAID0 is not set # CONFIG_MD_RAID1 is not set # CONFIG_MD_RAID5 is not set -CONFIG_BLK_DEV_LVM=y +# CONFIG_BLK_DEV_LVM is not set +CONFIG_BLK_DEV_DM=y # # General Setup @@ -40,7 +41,7 @@ CONFIG_UNIX98_PTY_COUNT=256 CONFIG_SSL=y CONFIG_HOSTFS=m CONFIG_MCONSOLE=y -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # # Loadable module support @@ -64,7 +65,9 @@ CONFIG_BLK_DEV_INITRD=y # Networking options # # CONFIG_PACKET is not set -# CONFIG_NETLINK is not set +CONFIG_NETLINK=y +# CONFIG_RTNETLINK is not set +# CONFIG_NETLINK_DEV is not set # CONFIG_NETFILTER is not set # CONFIG_FILTER is not set CONFIG_UNIX=y @@ -79,10 +82,6 @@ CONFIG_INET=y # CONFIG_IPV6 is not set # CONFIG_KHTTPD is not set # CONFIG_ATM is not set - -# -# -# # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set @@ -109,10 +108,11 @@ CONFIG_INET=y # ARCnet devices # # CONFIG_ARCNET is not set -# CONFIG_DUMMY is not set +CONFIG_DUMMY=y # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set +CONFIG_TUN=y +CONFIG_ETHERTAP=y # # Ethernet (10 or 100Mbit) @@ -132,8 +132,18 @@ CONFIG_INET=y # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set +CONFIG_PPP=y +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPPOE is not set +CONFIG_SLIP=y +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set # # Wireless LAN (non-hamradio) @@ -156,7 +166,14 @@ CONFIG_INET=y # # Network device support # -# CONFIG_NETDEVICES is not set +CONFIG_NETDEVICES=y +CONFIG_UML_NET=y +CONFIG_UML_NET_ETHERTAP=y +CONFIG_UML_NET_SLIP=y +CONFIG_UML_NET_DAEMON=y +CONFIG_UML_NET_MCAST=y +CONFIG_ETHERTAP=y +CONFIG_TUN=y # # File systems diff --git a/driver/user_mode_linux/setup-uml b/driver/user_mode_linux/setup-uml index c3274dd2e..612ca04f9 100755 --- a/driver/user_mode_linux/setup-uml +++ b/driver/user_mode_linux/setup-uml @@ -11,28 +11,28 @@ use Cwd; # the directory where you've checked out lvm, keep a seperate copy for uml, # the uml kernel will have links to these files -$lvm_src="/home/joe/sistina/LVM-thin"; +$lvm_src="/home/thornber/sistina/LVM2"; # the debian root image, get it from here: # http://prdownloads.sourceforge.net/user-mode-linux/root_fs_debian2.2_small.bz2 # unzip it once you've downloaded it -$root_fs="/home/joe/uml/root_fs"; +$root_fs="/home/thornber/uml/root_fs_debian2.2_small"; # these are 100 Meg files created with dd # these become our PV's /dev/ubd/[1-4] # I sometimes use ubd/1 as swap though. -@block_devices = ("/home/joe/uml/block_devices/scratch1", - "/home/joe/uml/block_devices/scratch2", - "/home/joe/uml/block_devices/scratch3", - "/home/joe/uml/block_devices/scratch4"); +@block_devices = ("/home/thornber/uml/scratch1", + "/home/thornber/uml/scratch2", + "/home/thornber/uml/scratch3", + "/home/thornber/uml/scratch4"); # directory where uml will be built, and the up, lvm-install scripts will # be placed -$dest_dir="/home/joe/builds/uml-thin"; +$dest_dir="/home/thornber/builds/uml-lvm2"; # It must be 2.4.8, can be .gz or .bz2 -$kernel_tarball="/home/joe/packages/2.4/linux-2.4.8.tar"; +$kernel_tarball="/home/thornber/packages/2.4/linux-2.4.9.tar"; ############################### # end of user configurable bit @@ -42,6 +42,7 @@ $kernel_tarball="/home/joe/packages/2.4/linux-2.4.8.tar"; $wd = cwd; $uml_patch = $wd . "/uml.patch.bz2"; $lvm_uml_patch = $wd . "/uml-lvm.patch"; +$driver = $lvm_src . "/driver/device-mapper"; # check we've got everything we need @@ -59,30 +60,17 @@ chdir("linux"); &run_command("bzip2 -dc $uml_patch | patch -p1", "patching kernel with uml"); &run_command("patch -p1 < $lvm_uml_patch", "enabling LVM driver"); -#chdir($lvm_src); -#&run_command("make clean; rm -f config.cache", "cleaning lvm src"); -#&run_command("./configure --prefix=$dest_dir/root_fs_mnt " . -# "--with-kernel_dir=$dest_dir/linux", -# "configuring lvm"); - chdir("$dest_dir/linux"); -#&run_command("patch -p1 < $lvm_src/PATCHES/lvm--2.4.6.patch", -# "patching lvm driver"); +&run_command("cd include/linux; ln -s $driver/device-mapper.h", + "linking device-mapper.h"); -&run_command("cd include/linux; rm -f lvm.h", "removing lvm.h"); - -&run_command("cd drivers/md; rm -f lvm*", - "removing the rest of the lvm files"); - -&run_command("cd include/linux; ln -s $lvm_src/kernel/device-mapper.h", - "creating symbolic link to device-mapper.h"); - -&run_command("cd drivers/md; ln -s $lvm_src/kernel/device-mapper.c", - "creating symbolic link to device-mapper.c"); - -&run_command("cp $wd/config-uml $dest_dir/linux/.config", - "copying linux config file"); +&run_command("cd drivers/md; ln -s $driver/dm.h", "linking dm.h"); +&run_command("cd drivers/md; ln -s $driver/dm-fs.c", "linking dm-fs.c"); +&run_command("cd drivers/md; ln -s $driver/dm-table.c", "linking dm-table.c"); +&run_command("cd drivers/md; ln -s $driver/dm-target.c", + "linking dm-target.c"); +&run_command("cd drivers/md; ln -s $driver/dm.c", "linking dm.c"); chdir("$dest_dir/linux"); &run_command("make oldconfig ARCH=um", "making oldconfig ARCH=um"); @@ -92,17 +80,13 @@ chdir("$dest_dir/linux"); chdir($dest_dir); &run_command("ln -s $dest_dir/linux/linux uml", "creating link for linux"); -chdir("$lvm_src"); -&run_command("make", - "building lvm tools - you will need to install them as root"); - chdir($dest_dir); &run_command("ln -s $root_fs ./root_fs", "linking root filesystem"); chdir($dest_dir); &link_devices(); &write_up(); -mkdir "root_fs_mnt"; +&run_command("mkdir root_fs_mnt"); &write_lvm_install(); print "Dont forget to run $dest_dir/lvm-install as root\n"; diff --git a/driver/user_mode_linux/uml-lvm.patch b/driver/user_mode_linux/uml-lvm.patch index 0697cb9c8..47817b193 100644 --- a/driver/user_mode_linux/uml-lvm.patch +++ b/driver/user_mode_linux/uml-lvm.patch @@ -9,14 +9,22 @@ mainmenu_option next_comment comment 'Processor features' bool 'Symmetric multi-processing support' CONFIG_SMP ---- linux/drivers/md/Makefile.orig Thu Jul 26 14:58:21 2001 -+++ linux/drivers/md/Makefile Thu Jul 26 14:58:40 2001 -@@ -6,7 +6,7 @@ +--- linux/drivers/md/Config.in.orig Tue Aug 21 14:18:30 2001 ++++ linux/drivers/md/Config.in Tue Aug 21 14:19:08 2001 +@@ -14,4 +14,6 @@ - export-objs := md.o xor.o - list-multi := lvm-mod.o --lvm-mod-objs := lvm.o lvm-snap.o -+lvm-mod-objs := device-mapper.o + dep_tristate ' Logical volume manager (LVM) support' CONFIG_BLK_DEV_LVM $CONFIG_MD + ++dep_tristate ' Device mapper support' CONFIG_BLK_DEV_DM $CONFIG_MD ++ + endmenu +--- linux/drivers/md/Makefile.orig Tue Aug 21 14:19:14 2001 ++++ linux/drivers/md/Makefile Tue Aug 21 14:20:06 2001 +@@ -19,6 +19,7 @@ + obj-$(CONFIG_MD_RAID5) += raid5.o xor.o + obj-$(CONFIG_BLK_DEV_MD) += md.o + obj-$(CONFIG_BLK_DEV_LVM) += lvm-mod.o ++obj-$(CONFIG_BLK_DEV_DM) += dm.o dm-table.o dm-target.o dm.o + + include $(TOPDIR)/Rules.make - # Note: link order is important. All raid personalities - # and xor.o must come before md.o, as they each initialise diff --git a/driver/user_mode_linux/uml.patch.bz2 b/driver/user_mode_linux/uml.patch.bz2 index 4c229a486..c21d1f072 100644 Binary files a/driver/user_mode_linux/uml.patch.bz2 and b/driver/user_mode_linux/uml.patch.bz2 differ