[IPCop-cvs] CVS: ipcop/tools/mkflash lilo.conf,NONE,1.1.2.1 lilo.flash,1.1.2.3,1.1.2.4 mkflash,1.1.2.3,1.1.2.4 rc.flash.up,1.1.2.1,1.1.2.2

[Mark W. <ri...@us...>]

Update of /cvsroot/ipcop/ipcop/tools/mkflash
In directory usw-pr-cvs1:/tmp/cvs-serv26455/tools/mkflash

Modified Files:
      Tag: IPCOP_v0_1
	lilo.flash mkflash rc.flash.up 
Added Files:
      Tag: IPCOP_v0_1
	lilo.conf 
Log Message:
Several fixes

--- NEW FILE: lilo.conf ---
boot	= /dev/harddisk
map	= /boot/map
install	= /boot/boot.b
message	= /boot/message
ramdisk = 81920
default	= IPCop
timeout	= 50
read-only
prompt
linear
image	= /boot/vmlinuz
  root	  = /dev/harddisk4
  label	  = IPCop

Index: lilo.flash
===================================================================
RCS file: /cvsroot/ipcop/ipcop/tools/mkflash/Attic/lilo.flash,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** lilo.flash	14 Apr 2002 11:03:13 -0000	1.1.2.3
--- lilo.flash	21 Apr 2002 19:17:28 -0000	1.1.2.4
***************
*** 14,17 ****
--- 14,18 ----
  install         = /boot/boot.b
  message		= /boot/message
+ ramdisk		= 81920
  default		= IPCop
  timeout		= 50

Index: mkflash
===================================================================
RCS file: /cvsroot/ipcop/ipcop/tools/mkflash/Attic/mkflash,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** mkflash	14 Apr 2002 11:03:13 -0000	1.1.2.3
--- mkflash	21 Apr 2002 19:17:28 -0000	1.1.2.4
***************
*** 37,41 ****
  ############################################################################
  echo "`date '+%b %e %T'`: Creating loopback and ramdisk devices"
! /dev/MAKEDEV loop0 loop1 loop2 loop3 ram0 ram1 ram2
  
  
--- 37,41 ----
  ############################################################################
  echo "`date '+%b %e %T'`: Creating loopback and ramdisk devices"
! /dev/MAKEDEV loop0 loop1 loop2 loop3 ram0 ramdisk
  
  
***************
*** 67,73 ****
  ############################################################################
  echo "`date '+%b %e %T'`: Making filesystems"
! mke2fs -F -m 0 -b 1024 /tmp/part1.img >/dev/null
! mke2fs -F -m 0 -b 1024 /tmp/part2.img >/dev/null
! mke2fs -F -m 0 -b 1024 /tmp/part3.img >/dev/null
  
  
--- 67,73 ----
  ############################################################################
  echo "`date '+%b %e %T'`: Making filesystems"
! mke2fs -F -j -m 0 -b 1024 /tmp/part1.img >/dev/null
! mke2fs -F -j -m 0 -b 1024 /tmp/part2.img >/dev/null
! mke2fs -F -j -m 0 -b 1024 /tmp/part3.img >/dev/null
  
  
***************
*** 112,118 ****
  ############################################################################
  echo "`date '+%b %e %T'`: Creating flash image directory structure"
! mkdir -p /mnt/flash/proc/
! mkdir /mnt/flash/tmp/
! chmod ugo+rwx,o+t /mnt/flash/tmp/
  
  
--- 112,116 ----
  ############################################################################
  echo "`date '+%b %e %T'`: Creating flash image directory structure"
! mkdir -p /mnt/flash/{ram/,proc/}
  
  
***************
*** 129,138 ****
  mkdir -p /mnt/flash/var/{log,log_compressed,spool,www/icons}
  cp -a /var/ipcop /var/lib /var/lock /var/log /var/mail /var/opt /mnt/flash/var
  cp -a /var/preserve /var/run /mnt/flash/var
  cp -a /var/spool/cron /var/spool/mail /mnt/flash/var/spool
  ln -s /tmp /mnt/flash/var/patches
! mkdir -p /mnt/flash/var/spool/squid
! chmod 750 /mnt/flash/var/spool/squid
! chown squid:squid /mnt/flash/var/spool/squid
  
  rm -f  /mnt/flash/var/lib/logrotate.status
--- 127,135 ----
  mkdir -p /mnt/flash/var/{log,log_compressed,spool,www/icons}
  cp -a /var/ipcop /var/lib /var/lock /var/log /var/mail /var/opt /mnt/flash/var
+ rm -rf /mnt/flash/var/log/lost+found
  cp -a /var/preserve /var/run /mnt/flash/var
  cp -a /var/spool/cron /var/spool/mail /mnt/flash/var/spool
  ln -s /tmp /mnt/flash/var/patches
! ln -sf /ram/squid /var/spool/squid
  
  rm -f  /mnt/flash/var/lib/logrotate.status
***************
*** 148,152 ****
  find /mnt/flash/var/log -type f -exec rm -f {} \;
  tar -C /mnt/flash -czf /mnt/flash/var/log_compressed/log.tgz var/log/
! rm -rf /mnt/flash/var/log/*
  
  # Other files
--- 145,150 ----
  find /mnt/flash/var/log -type f -exec rm -f {} \;
  tar -C /mnt/flash -czf /mnt/flash/var/log_compressed/log.tgz var/log/
! rm -rf /mnt/flash/var/log/
! ln -sf /ram/log /mnt/flash/var/log
  
  # Other files
***************
*** 166,174 ****
  cp -a  /usr /mnt/flash
  
! rm -rf /mnt/flash/var/tmp
! ln -s /tmp/ /mnt/flash/var/tmp
! 
! rm -f /mnt/flash/usr/tmp
! ln -s /tmp/ /mnt/flash/usr/tmp
  
  
--- 164,171 ----
  cp -a  /usr /mnt/flash
  
! rm -rf /mnt/flash/{tmp/,usr/tmp/,var/tmp/}
! ln -sf /ram/tmp/ /mnt/flash/tmp
! ln -sf /ram/tmp/ /mnt/flash/usr/tmp
! ln -sf /ram/tmp/ /mnt/flash/var/tmp
  
  
***************
*** 181,184 ****
--- 178,182 ----
  losetup /dev/loop3 /tmp/flash.img
  cp lilo.flash /mnt/flash
+ cp -f lilo.conf /mnt/flash/etc
  lilo -C lilo.flash -r /mnt/flash
  rm -f /mnt/flash/lilo.flash

Index: rc.flash.up
===================================================================
RCS file: /cvsroot/ipcop/ipcop/tools/mkflash/Attic/rc.flash.up,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** rc.flash.up	10 Apr 2002 11:41:07 -0000	1.1.2.1
--- rc.flash.up	21 Apr 2002 19:17:28 -0000	1.1.2.2
***************
*** 1,17 ****
! umount -f /dev/ram0
! umount -f /dev/ram1
! umount -f /dev/ram2
  
! mke2fs -b 1024 /dev/ram0 20480		# /tmp		   = 20 MB
! mke2fs -b 1024 /dev/ram1 20480		# /var/log	   = 20 MB
! mke2fs -b 1024 -m 0 /dev/ram2 51200	# /var/spool/squid = 50 MB
  
! rm -rf /tmp/*
! rm -rf /var/log/*
! rm -rf /var/spool/squid/*
  
! mount /dev/ram0 /tmp/
! mount /dev/ram1 /var/log/
! mount /dev/ram2 /var/spool/squid/
  
! tar -xzf /var/log_compressed/log.tgz -C /var/log
--- 1,18 ----
! # Created using mkflash version 0.3.0
! umount /dev/ramdisk
! mke2fs -b 1024 -m 0 /dev/ramdisk
  
! rm -rf /tmp/
! rm -rf /var/log
! rm -rf /var/spool/squid/
  
! mount /dev/ramdisk /ram/
! mkdir -p /ram/{log,squid,tmp}
  
! chown squid:squid /ram/squid
! chmod ugo+rwx,o+t /ram/tmp/
  
! tar -xzf /var/log_compressed/log.tgz -C /ram
! ln -s /ram/var/log /var/log
! ln -s /ram/squid /var/spool/squid
! ln -s /ram/tmp /tmp