diff options
| author | kos <kos@dev3> | 2013-01-17 10:19:05 (GMT) |
|---|---|---|
| committer | kos <kos@dev3> | 2013-01-17 10:19:05 (GMT) |
| commit | 5e444f46931668ef5672816a4ef8b07858a8734c (patch) | |
| tree | 397e66839720e9a50a11e227a8177805968ac303 | |
| parent | 03715cb475f48f932913f188de32fe4095f8979f (diff) | |
| parent | 8ef469d77147d4d8e06a6ede9de4c85cfe0a5f0d (diff) | |
Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
7 files changed, 17 insertions, 23 deletions
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab index 5e15a51..fb5ea33 100755 --- a/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab +++ b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab @@ -2,9 +2,8 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbfs defaults 0 0 -/dev/mtdblock2 /boot jffs2 ro 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /tmp tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/mtdblock2 /boot jffs2 ro 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 /dev/sda1 /media/hdd auto defaults 0 0 diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab index 13869e9..07c55d7 100755 --- a/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab @@ -2,8 +2,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /tmp tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 /dev/sda1 /media/hdd auto defaults 0 0 diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab index 5e15a51..fb5ea33 100755 --- a/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab +++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab @@ -2,9 +2,8 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbfs defaults 0 0 -/dev/mtdblock2 /boot jffs2 ro 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /tmp tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/mtdblock2 /boot jffs2 ro 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 /dev/sda1 /media/hdd auto defaults 0 0 diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab index 13869e9..07c55d7 100755 --- a/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab +++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab @@ -2,8 +2,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /tmp tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 /dev/sda1 /media/hdd auto defaults 0 0 diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab index 5e15a51..fb5ea33 100755 --- a/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab @@ -2,9 +2,8 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbfs defaults 0 0 -/dev/mtdblock2 /boot jffs2 ro 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /tmp tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/mtdblock2 /boot jffs2 ro 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 /dev/sda1 /media/hdd auto defaults 0 0 diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab index 5e15a51..fb5ea33 100755 --- a/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab @@ -2,9 +2,8 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbfs defaults 0 0 -/dev/mtdblock2 /boot jffs2 ro 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /tmp tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/mtdblock2 /boot jffs2 ro 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 /dev/sda1 /media/hdd auto defaults 0 0 diff --git a/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend index 3d5c1d9..b3ba9e4 100644 --- a/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,4 +1,4 @@ -PR .= "-vuplus2" +PR .= "-vuplus3" do_install_append() { ln -s media/hdd ${D}/hdd |