Changeset 28df043 in freewrt


Ignore:
Timestamp:
Jun 10, 2006, 3:22:48 PM (20 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
a5bb8b8
Parents:
e59ae5b
Message:

enable automatic reboot after jffs2move, from OpenWrt ticketsystem, thx consulting@…, rename OpenWrt partition to data, add mini-fo as default kernel module

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@34 afb5a338-a214-0410-bd46-81f09a774fd1

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • package/base-files/default/bin/firstboot

    re59ae5b r28df043  
    6363
    6464        [ "$1" = "switch2jffs" ] && {
    65                 mtd erase OpenWrt
     65                mtd erase data
    6666                mount -o remount,ro none / # try to avoid fs changing while copying
    6767                mount -o bind / /mnt
    … …  
    8686        }
    8787
    88         mtd erase OpenWrt
     88        mtd erase data
    8989        mountdp /dev/mtdblock/4 /jffs -t jffs2
    9090}

  • package/base-files/default/sbin/mount_root

    re59ae5b r28df043  
    1414        if [ $? = 0 ] ; then
    1515                if [ $(cat /proc/mtd | wc -l) = 6 ]; then
    16                         mtd erase OpenWrt
    17                         jffs2root --move
     16                        mtd erase data
     17                        jffs2root --move --reboot
    1818                else
    1919                        mount -o remount,rw /dev/root /

  • target/linux/brcm-2.4/patches/004-flash.patch

    re59ae5b r28df043  
    11diff -Nur linux-2.4.32/drivers/mtd/devices/Config.in linux-2.4.32-flash/drivers/mtd/devices/Config.in
    22--- linux-2.4.32/drivers/mtd/devices/Config.in  2003-06-13 16:51:34.000000000 +0200
    3 +++ linux-2.4.32-flash/drivers/mtd/devices/Config.in    2006-03-27 17:10:51.000000000 +0200
     3+++ linux-2.4.32-flash/drivers/mtd/devices/Config.in    2006-06-10 12:05:08.000000000 +0200
    44@@ -5,6 +5,7 @@
    55 mainmenu_option next_comment
    … …  
    1212diff -Nur linux-2.4.32/drivers/mtd/devices/Makefile linux-2.4.32-flash/drivers/mtd/devices/Makefile
    1313--- linux-2.4.32/drivers/mtd/devices/Makefile   2002-11-29 00:53:13.000000000 +0100
    14 +++ linux-2.4.32-flash/drivers/mtd/devices/Makefile     2006-03-27 17:10:51.000000000 +0200
     14+++ linux-2.4.32-flash/drivers/mtd/devices/Makefile     2006-06-10 12:05:08.000000000 +0200
    1515@@ -3,6 +3,8 @@
    1616 #
    … …  
    3232diff -Nur linux-2.4.32/drivers/mtd/devices/sflash.c linux-2.4.32-flash/drivers/mtd/devices/sflash.c
    3333--- linux-2.4.32/drivers/mtd/devices/sflash.c   1970-01-01 01:00:00.000000000 +0100
    34 +++ linux-2.4.32-flash/drivers/mtd/devices/sflash.c     2006-03-27 17:10:51.000000000 +0200
     34+++ linux-2.4.32-flash/drivers/mtd/devices/sflash.c     2006-06-10 12:05:08.000000000 +0200
    3535@@ -0,0 +1,298 @@
    3636+/*
    … …  
    334334diff -Nur linux-2.4.32/drivers/mtd/maps/bcm947xx-flash.c linux-2.4.32-flash/drivers/mtd/maps/bcm947xx-flash.c
    335335--- linux-2.4.32/drivers/mtd/maps/bcm947xx-flash.c      1970-01-01 01:00:00.000000000 +0100
    336 +++ linux-2.4.32-flash/drivers/mtd/maps/bcm947xx-flash.c        2006-03-27 17:07:27.000000000 +0200
     336+++ linux-2.4.32-flash/drivers/mtd/maps/bcm947xx-flash.c        2006-06-10 12:06:52.000000000 +0200
    337337@@ -0,0 +1,416 @@
    338338+/*
    339339+ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
    340 + *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
     340+ *  Copyright (C) 2006 Waldemar Brodkorb <wbx@freewrt.org>
    341341+ *
    342342+ *  original functions for finding root filesystem from Mike Baker
    … …  
    491491+       { name: "rootfs", offset: 0, size: 0, },
    492492+       { name: "nvram", offset: 0, size: 0, },
    493 +       { name: "OpenWrt", offset: 0, size: 0, },
     493+       { name: "data", offset: 0, size: 0, },
    494494+       { name: NULL, },
    495495+};
    … …  
    754754diff -Nur linux-2.4.32/drivers/mtd/maps/Config.in linux-2.4.32-flash/drivers/mtd/maps/Config.in
    755755--- linux-2.4.32/drivers/mtd/maps/Config.in     2003-06-13 16:51:34.000000000 +0200
    756 +++ linux-2.4.32-flash/drivers/mtd/maps/Config.in       2006-01-31 22:03:50.000000000 +0100
     756+++ linux-2.4.32-flash/drivers/mtd/maps/Config.in       2006-06-10 12:05:08.000000000 +0200
    757757@@ -48,6 +48,7 @@
    758758 fi
    … …  
    765765diff -Nur linux-2.4.32/drivers/mtd/maps/Makefile linux-2.4.32-flash/drivers/mtd/maps/Makefile
    766766--- linux-2.4.32/drivers/mtd/maps/Makefile      2003-06-13 16:51:34.000000000 +0200
    767 +++ linux-2.4.32-flash/drivers/mtd/maps/Makefile        2006-01-31 22:03:50.000000000 +0100
     767+++ linux-2.4.32-flash/drivers/mtd/maps/Makefile        2006-06-10 12:05:08.000000000 +0200
    768768@@ -3,6 +3,8 @@
    769769 #

  • target/linux/image/brcm/Makefile

    re59ae5b r28df043  
    5555
    5656ifneq ($(FS),jffs2-8MB)
    57 $(BIN_DIR)/freewrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS).trx
    58         $(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g
    59        
    6057$(BIN_DIR)/freewrt-wrt54g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS).trx
    6158        $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
    … …  
    6461        $(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g
    6562
    66 install: $(BIN_DIR)/freewrt-wrt54g-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/freewrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/freewrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin
     63install: $(BIN_DIR)/freewrt-wrt54g-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/freewrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin
    6764
    6865endif
    … …  
    7370
    7471ifneq ($(FS),jffs2-8MB)
    75 $(BIN_DIR)/freewrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS).trx
    76         $(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g
    77        
    7872$(BIN_DIR)/freewrt-wrt54g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS).trx
    7973        $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
    … …  
    8276        $(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g
    8377
    84 $(BIN_DIR)/freewrt-wr850g-$(FSNAME).bin: $(BIN_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS).trx
    85         $(STAGING_DIR)/bin/motorola-bin -1 $< $@
    86 
    87 $(BIN_DIR)/freewrt-wa840g-$(FSNAME).bin: $(BIN_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS).trx
    88         $(STAGING_DIR)/bin/motorola-bin -2 $< $@
    89 
    90 $(BIN_DIR)/freewrt-we800g-$(FSNAME).bin: $(BIN_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS).trx
    91         $(STAGING_DIR)/bin/motorola-bin -3 $< $@
    92 
    93 install: $(BIN_DIR)/freewrt-wrt54g-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/freewrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/freewrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/freewrt-wr850g-$(FSNAME).bin $(BIN_DIR)/freewrt-wa840g-$(FSNAME).bin $(BIN_DIR)/freewrt-we800g-$(FSNAME).bin
     78install: $(BIN_DIR)/freewrt-wrt54g-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/freewrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin
    9479endif
    9580

  • target/linux/package/base-files/src/jffs2root.c

    re59ae5b r28df043  
    3232
    3333#include <sys/ioctl.h>
     34#include <sys/syscall.h>
    3435#include <linux/mtd/mtd.h>
     36#include <linux/reboot.h>
    3537
    3638#define FILENAME "/dev/mtdblock/1"
    … …  
    7880        struct trx_header *ptr;
    7981        char *buf;
     82        int reboot;
     83
     84        reboot = 0;
    8085       
    8186        if (((fd = open(FILENAME, O_RDWR))      < 0)
    … …  
    106111                        ptr->crc32 = crc32buf((void *) &(ptr->flag_version), ptr->len - offsetof(struct trx_header, flag_version));
    107112                        msync(ptr,sizeof(struct trx_header),MS_SYNC|MS_INVALIDATE);
    108                         printf("Partition moved; please reboot\n");
     113                        if (argc > 2 && !strcmp(argv[2],"--reboot")) {
     114                                reboot=1;
     115                                printf("Partition moved.\n");
     116                        } else {
     117                                printf("Partition moved; please reboot\n");
     118                        }
    109119                }
    110120        } else if (argc > 1 && !strcmp(argv[1], "--clean")) {
    … …  
    130140
    131141        munmap((void *) ptr, len);
     142        if (reboot) {
     143                fflush(stdout);
     144                syscall(SYS_reboot,LINUX_REBOOT_MAGIC1,LINUX_REBOOT_MAGIC2,LINUX_REBOOT_CMD_RESTART,NULL);
     145        }
    132146        return 0;
    133147}

  • target/linux/package/mini_fo/Config.in

    re59ae5b r28df043  
    22        prompt "kmod-mini_fo...................... mini fanout overlay file system"
    33        tristate
    4         default m if CONFIG_DEVEL
     4        default y
    55        help
    66          The mini fanout overlay file system.
Note: See TracChangeset for help on using the changeset viewer.