diff options
| -rw-r--r-- | data/kernel.wanted.config | 78 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 54 |
2 files changed, 101 insertions, 31 deletions
diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config index 4b36464f..a2e646a1 100644 --- a/data/kernel.wanted.config +++ b/data/kernel.wanted.config @@ -92,6 +92,84 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXYNOS_VIDEO=y +<<<<<<< HEAD +#CONFIG_FB_3DFX_ACCEL=y +#CONFIG_FB_3DFX_I2C=y +#CONFIG_FB_3DFX=y +#CONFIG_FB_ARC=y +#CONFIG_FB_ARK=y +#CONFIG_FB_ASILIANT=y +#CONFIG_FB_ATY128_BACKLIGHT=y +#CONFIG_FB_ATY128=y +#CONFIG_FB_ATY_BACKLIGHT=y +#CONFIG_FB_ATY_CT=y +#CONFIG_FB_ATY_GX=y +#CONFIG_FB_ATY=y +#CONFIG_FB_BACKLIGHT=y +CONFIG_FB_BOOT_VESA_SUPPORT=y +#CONFIG_FB_BROADSHEET=y +#CONFIG_FB_CARILLO_RANCH=y +#CONFIG_FB_CARMINE_DRAM_EVAL=y +#CONFIG_FB_CARMINE=y +#CONFIG_FB_CIRRUS=y +#CONFIG_FB_CYBER2000_DDC=y +#CONFIG_FB_CYBER2000=y +#CONFIG_FB_DDC=y +#CONFIG_FB_DEFERRED_IO=y +#CONFIG_FB_GEODE_GX1=y +#CONFIG_FB_GEODE_GX=y +#CONFIG_FB_GEODE_LX=y +#CONFIG_FB_GEODE=y +#CONFIG_FB_I740=y +#CONFIG_FB_IMSTT=y +#CONFIG_FB_KYRO=y +#CONFIG_FB_LE80578=y +#CONFIG_FB_MATROX_G=y +#CONFIG_FB_MATROX_I2C=y +#CONFIG_FB_MATROX_MAVEN=y +#CONFIG_FB_MATROX_MILLENIUM=y +#CONFIG_FB_MATROX_MYSTIQUE=y +#CONFIG_FB_MATROX=y +#CONFIG_FB_MB862XX_I2C=y +#CONFIG_FB_MB862XX_PCI_GDC=y +#CONFIG_FB_MB862XX=y +#CONFIG_FB_METRONOME=y +#CONFIG_FB_NEOMAGIC=y +#CONFIG_FB_NVIDIA_BACKLIGHT=y +#CONFIG_FB_NVIDIA_I2C=y +#CONFIG_FB_NVIDIA=y +#CONFIG_FB_PM2_FIFO_DISCONNECT=y +#CONFIG_FB_PM2=y +#CONFIG_FB_PM3=y +#CONFIG_FB_RADEON_BACKLIGHT=y +#CONFIG_FB_RADEON_I2C=y +#CONFIG_FB_RADEON=y +#CONFIG_FB_RIVA_BACKLIGHT=y +#CONFIG_FB_RIVA_I2C=y +#CONFIG_FB_RIVA=y +#CONFIG_FB_S3_DDC=y +#CONFIG_FB_S3=y +#CONFIG_FB_SAVAGE_ACCEL=y +#CONFIG_FB_SAVAGE_I2C=y +#CONFIG_FB_SAVAGE=y +#CONFIG_FB_SIS_300=y +#CONFIG_FB_SIS_315=y +#CONFIG_FB_SIS=y +#CONFIG_FB_SMSCUFX=y +#CONFIG_FB_SVGALIB=y +#CONFIG_FB_SYS_COPYAREA=y +#CONFIG_FB_SYS_FILLRECT=y +#CONFIG_FB_SYS_FOPS=y +#CONFIG_FB_SYS_IMAGEBLIT=y +#CONFIG_FB_TRIDENT=y +#CONFIG_FB_UDL=y +CONFIG_FB_VESA=y +#CONFIG_FB_VIA_X_COMPATIBILITY=y +#CONFIG_FB_VIA=y +#CONFIG_FB_VOODOO1=y +#CONFIG_FB_VT8623=y +======= +>>>>>>> 50e92b9f7e911d327b9d5d271e40b519ed6eb47c CONFIG_FEALNX=y CONFIG_FORCEDETH=y CONFIG_GENERIC_GPIO=y diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 93df822c..01a74f23 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -63,10 +63,6 @@ if [ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ]; then plymouthd && plymouth show-splash fi -# still needed? -#echo "modprobe -qa usbhid hid-bright" >/etc/modprobe.base -#/bin/sh /etc/modprobe.base; mdev -s - # setup network nwif="eth0" # set up loopback networking @@ -79,37 +75,32 @@ ip link set dev $nwif up 2>/dev/null || { echo "No link for $nwif, dropping to # analyze ip information from the kernel command line and put parts # of it into several variables if [ -n "$ipinfo" ] ; then - getip () { - local val="$ipinfo:"; i=$(($1 - 1)); - while [ $i -gt 0 ] ; do - val=${val#*:} ; i=$(($i - 1)); - done; - echo $val|sed "s/:.*//"; } - clientip=$(getip 1) - serverip=$(getip 2) - gateway=$(getip 3) - subnet_mask=$(getip 4) - broadcast_address=$(ipcalc -s -b $clientip $subnet_mask|sed s/.*=//) - [ -z "$broadcast_address" ] && broadcast_address=255.255.255.255 - # we might have an idea of the dns server via preboot - dns_srv=$(getip 5) - [ -n "$dns_srv" ] && echo nameserver $dns_srv >/etc/resolv.conf; - echo -e "# ip configuration written by $0 script:\nclientip=$clientip\n\ + getip () { + local val="$ipinfo:"; i=$(($1 - 1)); + while [ $i -gt 0 ] ; do + val=${val#*:} ; i=$(($i - 1)); + done; + echo $val|sed "s/:.*//"; } + clientip=$(getip 1) + serverip=$(getip 2) + gateway=$(getip 3) + subnet_mask=$(getip 4) + broadcast_address=$(ipcalc -s -b $clientip $subnet_mask|sed s/.*=//) + [ -z "$broadcast_address" ] && broadcast_address=255.255.255.255 + # we might have an idea of the dns server via preboot + dns_srv=$(getip 5) + [ -n "$dns_srv" ] && echo nameserver $dns_srv >/etc/resolv.conf; + echo -e "# ip configuration written by $0 script:\nclientip=$clientip\n\ subnet_mask=$subnet_mask\ngateway=$gateway\nserverip=$serverip\n\ broadcast_address=$broadcast_address" >>/etc/initramfs-setup - # set static ip address - ip addr add $clientip/$(ipcalc -s -p $clientip $subnet_mask|sed s/.*=//) \ - broadcast $broadcast_address dev $nwif 2>/dev/null - ip route add default via $gateway 2>/dev/null + # set static ip address + ip addr add $clientip/$(ipcalc -s -p $clientip $subnet_mask|sed s/.*=//) \ + broadcast $broadcast_address dev $nwif 2>/dev/null + ip route add default via $gateway 2>/dev/null else - noipyet="yes" + noipyet="yes" fi - -# load local file systems - in kernel now! :-) -#modprobe aufs -#modprobe squashfs - mkdir -p /dev/shm/union /dev/shm/uniontmp /rorootfs mount -n -t tmpfs none /dev/shm/uniontmp @@ -130,12 +121,13 @@ else fi echo "Building aufs..." +#mount -t overlayfs -o lowerdir=/rorootfs,upperdir=/dev/shm/uniontmp overlayfs /mnt mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt mkdir -p /mnt/uniontmp /mnt/tmp mount -n --move /dev/shm/uniontmp /mnt/uniontmp # create udev rule for nic we booted from -echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="'$macaddr'", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"' > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" +[ -e "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" ] && echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="'$macaddr'", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"' > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" for mnt in proc sys run ; do umount -n $mnt |