alot of smaller changes
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
This commit is contained in:
		
					parent
					
						
							
								6a7dfe8cad
							
						
					
				
			
			
				commit
				
					
						b99e5f9c7a
					
				
			
		
					 8 changed files with 38 additions and 30 deletions
				
			
		| 
						 | 
					@ -1,14 +1,16 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					dev1="/dev/sd$1"; shift
 | 
				
			||||||
 | 
					dev2="/dev/sd$1"; shift
 | 
				
			||||||
 | 
					dev3="/dev/sd$1"; shift
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#devs='/dev/sde /dev/sdf /dev/sdg'
 | 
					#devs='/dev/sde /dev/sdf /dev/sdg'
 | 
				
			||||||
devs="/dev/sde /dev/sdc /dev/sdd"
 | 
					devs="/dev/sde /dev/sdc /dev/sdd"
 | 
				
			||||||
devs="/dev/sdb /dev/sdc /dev/sdd"
 | 
					 | 
				
			||||||
devs="/dev/sdc /dev/sdb"
 | 
					 | 
				
			||||||
set -e
 | 
					set -e
 | 
				
			||||||
set -x
 | 
					set -x
 | 
				
			||||||
mdadm --assemble /dev/md0 $devs
 | 
					mdadm --assemble /dev/md0 $dev1 $dev2 $dev3
 | 
				
			||||||
cryptsetup luksOpen /dev/md0 raid
 | 
					cryptsetup luksOpen /dev/md0 raid
 | 
				
			||||||
fsck /dev/mapper/raid
 | 
					fsck /dev/mapper/raid
 | 
				
			||||||
mount /home/server/raid
 | 
					mount /home/services/raid
 | 
				
			||||||
 | 
					
 | 
				
			||||||
exit 0
 | 
					exit 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
#!/bin/sh -e
 | 
					#!/bin/sh -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ccollect=/home/user/nico/p/ccollect/ccollect/ccollect.sh
 | 
					ccollect=/home/users/nico/lp/ccollect/ccollect/ccollect.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# in pre_exec
 | 
					# in pre_exec
 | 
				
			||||||
#cryptsetup luksOpen /dev/sdc usbhd
 | 
					#cryptsetup luksOpen /dev/sdc usbhd
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,3 +5,4 @@ wpa_cli terminate
 | 
				
			||||||
killall vpnc
 | 
					killall vpnc
 | 
				
			||||||
ip l s wlan0 down
 | 
					ip l s wlan0 down
 | 
				
			||||||
ip l s eth0 up   
 | 
					ip l s eth0 up   
 | 
				
			||||||
 | 
					udhcpc -nfqi eth0
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,9 +16,9 @@ set -x
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ip l s eth0 down
 | 
					ip l s eth0 down
 | 
				
			||||||
( wpa_cli terminate; exit 0 )
 | 
					( wpa_cli terminate; exit 0 )
 | 
				
			||||||
rmmod iwlagn
 | 
					
 | 
				
			||||||
modprobe iwlagn
 | 
					( rmmod iwlagn; modprobe iwlagn; sleep 2 )
 | 
				
			||||||
sleep 2
 | 
					
 | 
				
			||||||
wpa_supplicant -B -Dwext -iwlan0 -c ~nico/ethz/wlan/wpa_supplicant.conf
 | 
					wpa_supplicant -B -Dwext -iwlan0 -c ~nico/ethz/wlan/wpa_supplicant.conf
 | 
				
			||||||
sleep 5
 | 
					sleep 5
 | 
				
			||||||
udhcpc -nqfi wlan0
 | 
					udhcpc -nqfi wlan0
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,14 +1,28 @@
 | 
				
			||||||
#!/bin/sh
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dest="${0%%*/}.log"
 | 
					host="$(hostname)"
 | 
				
			||||||
 | 
					dest="${0%%*/}.${host}.log"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(
 | 
					(
 | 
				
			||||||
 | 
					   # system / software
 | 
				
			||||||
   uname -a
 | 
					   uname -a
 | 
				
			||||||
   dmesg
 | 
					   dmesg
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   # pci stuff
 | 
				
			||||||
   lspci -nn
 | 
					   lspci -nn
 | 
				
			||||||
   lspci -vv
 | 
					   lspci -vv
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   # hw in total
 | 
				
			||||||
   lshw
 | 
					   lshw
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   # ram
 | 
				
			||||||
   free
 | 
					   free
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   # cpu
 | 
				
			||||||
   cat /proc/cpuinfo
 | 
					   cat /proc/cpuinfo
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   # disk
 | 
				
			||||||
 | 
					   mount
 | 
				
			||||||
 | 
					   df -h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
) 2>&1 | tee "$dest"
 | 
					) 2>&1 | tee "$dest"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,6 +41,8 @@ else
 | 
				
			||||||
   version="$(git tag | tail -n1)"
 | 
					   version="$(git tag | tail -n1)"
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					novversion=$(echo $version | sed 's/^v//')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Building $version"
 | 
					echo "Building $version"
 | 
				
			||||||
echo "$version" > "$marker"
 | 
					echo "$version" > "$marker"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -48,31 +50,19 @@ git checkout -b "${__myname}-${version}" ${version}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# build kernel
 | 
					# build kernel
 | 
				
			||||||
make $parallel clean
 | 
					make $parallel clean
 | 
				
			||||||
make $parallel defconfig
 | 
					cat /boot/config-2.6.26-2-amd64 >> .config
 | 
				
			||||||
#cat /boot/config-2.6.26-2-amd64 >> .config
 | 
					yes "" | make $parallel oldconfig
 | 
				
			||||||
 | 
					 | 
				
			||||||
cat << eof
 | 
					 | 
				
			||||||
CONFIG_BNX2=y
 | 
					 | 
				
			||||||
CONFIG_SCSI=y
 | 
					 | 
				
			||||||
CONFIG_SCSI_DMA=y
 | 
					 | 
				
			||||||
CONFIG_SCSI_PROC_FS=y
 | 
					 | 
				
			||||||
CONFIG_BLK_DEV_SD=y
 | 
					 | 
				
			||||||
CONFIG_BLK_DEV_SR=y
 | 
					 | 
				
			||||||
CONFIG_CHR_DEV_SG=y
 | 
					 | 
				
			||||||
CONFIG_SCSI_MPT2SAS=y
 | 
					 | 
				
			||||||
CONFIG_XFS_FS=y
 | 
					 | 
				
			||||||
CONFIG_EXT3_FS=y
 | 
					 | 
				
			||||||
eof
 | 
					 | 
				
			||||||
>> .config
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
make $parallel all
 | 
					make $parallel all
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# install kernel
 | 
					# install kernel
 | 
				
			||||||
make $parallel install modules_install
 | 
					make $parallel install modules_install
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# copy kernel image
 | 
					# create initramfs
 | 
				
			||||||
cp "arch/x86/boot/bzImage" "/boot/${__myname}"
 | 
					update-initramfs -c -k "$novversion"
 | 
				
			||||||
#update-initramfs -c -k "$version"
 | 
					
 | 
				
			||||||
 | 
					# copy images
 | 
				
			||||||
 | 
					cp "arch/x86/boot/bzImage" "/boot/vmlinuz-${__myname}"
 | 
				
			||||||
 | 
					cp "/boot/initrd.img-${novversion}" "/boot/initrd-${__myname}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# reboot
 | 
					# reboot
 | 
				
			||||||
#reboot
 | 
					#reboot
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,4 @@
 | 
				
			||||||
#!/bin/sh
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					xrandr --output LVDS --auto
 | 
				
			||||||
xrandr --output VGA --auto
 | 
					xrandr --output VGA --auto
 | 
				
			||||||
xrandr --output VGA --right-of LVDS
 | 
					xrandr --output VGA --right-of LVDS
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@ HOST="home.schottelius.org"
 | 
				
			||||||
HOST="nico@77.109.138.222"
 | 
					HOST="nico@77.109.138.222"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ssh -T -f -C -N -L2323:mx3.schottelius.org:$IMAPS "$HOST"
 | 
					ssh -T -f -C -N -L2323:mx3.schottelius.org:$IMAPS "$HOST"
 | 
				
			||||||
ssh -T -f -C -N -L4242:mx3.schottelius.org:$SMTP "$HOST"
 | 
					ssh -T -f -C -N -L4241:mx3.schottelius.org:$SMTP "$HOST"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Fernzugriff
 | 
					# Fernzugriff
 | 
				
			||||||
ssh -T -f -C -N -R4242:localhost:22 "$HOST"
 | 
					ssh -T -f -C -N -R4242:localhost:22 "$HOST"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue