Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add squashfs images for x86 #1596

Closed
txt-file opened this issue Dec 3, 2018 · 7 comments · Fixed by #1634
Closed

add squashfs images for x86 #1596

txt-file opened this issue Dec 3, 2018 · 7 comments · Fixed by #1634
Labels
0. type: enhancement The changeset is an enhancement

Comments

@txt-file
Copy link
Contributor

txt-file commented Dec 3, 2018

I would like to have x86 images with failsafe mode.

@neocturne
Copy link
Member

Does sysupgrade between ext4 and squashfs work smoothly? If that is the case, we can just replace our ext4 images with squashfs. I don't think we should provide two different images for the same targets.

@rotanid rotanid added the 0. type: enhancement The changeset is an enhancement label Dec 7, 2018
@mweinelt
Copy link
Contributor

@txt-file Can you test the sysupgrade between ext4 and squahfs and report back?

@txt-file
Copy link
Contributor Author

I tried it with stock OpenWrt 18.06.1 in both directions without preserving the config. It worked and the device booted after flashing via sysupgrade.

@rotanid
Copy link
Member

rotanid commented Jan 14, 2019

i'm pretty sure that the question was about keeping/preserving config, otherwise it wouldnt make sense to remove an image type...

@txt-file
Copy link
Contributor Author

  1. Nobody explicitly said that I should test to preserve the config.
  2. I also think that without config preservation the upgrade is useless. This is why I explicitly said that I did not test this. Today I first wanted to make sure that changing the filesystem is possible.

I didn't manage to test all the thing but wanted to share my test results. My plan is to test config preservation under OpenWrt and gluon next Monday.

@txt-file
Copy link
Contributor Author

txt-file commented Jan 21, 2019

[edit 2019-01-24]
I flashed a HP thin client with an image compiled from master branch without modifications. Then I changed the target to squashfs, compiled again and flashed this image via sysupgrade. To check if the configuration is preserved I did set a hostname an a password. Both setting have been preserved. This is only a very small test and we should do more tests before switching file systems. My current patch is available at gitlab.com/txt.file/gluon. I plan to send a pull request on Monday.
[/edit]

BusyBox v1.28.4 () built-in shell (ash)

  _______                     ________        __
 |       |.-----.-----.-----.|  |  |  |.----.|  |_
 |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
 |_______||   __|_____|__|__||________||__|  |____|
          |__| W I R E L E S S   F R E E D O M
 -----------------------------------------------------
 OpenWrt 18.06-SNAPSHOT, r7653+12-939fa07b04
 -----------------------------------------------------
root@ffc-halloTest:~# mount
/dev/root on / type ext4 (rw,noatime,block_validity,delalloc,barrier,user_xattr)
proc on /proc type proc (rw,nosuid,nodev,noexec,noatime)
sysfs on /sys type sysfs (rw,nosuid,nodev,noexec,noatime)
tmpfs on /tmp type tmpfs (rw,nosuid,nodev,noatime)
/dev/sda1 on /boot type ext4 (rw,noatime,block_validity,delalloc,barrier,user_xattr)
/dev/sda1 on /boot type ext4 (rw,noatime,block_validity,delalloc,barrier,user_xattr)
tmpfs on /dev type tmpfs (rw,nosuid,relatime,size=512k,mode=755)
devpts on /dev/pts type devpts (rw,nosuid,noexec,relatime,mode=600,ptmxmode=000)
debugfs on /sys/kernel/debug type debugfs (rw,noatime)
root@ffc-halloTest:~# cat /lib/gluon/gluon-version
v2018.2-11-g692f61ec+
root@ffc-halloTest:~# cat /lib/gluon/release
b20190121-multi
root@ffc-halloTest:~# 
[…]
root@ffc-halloTest:/tmp# sysupgrade gluon-ffc-b20190121-multi-x86-generic.img 
Image metadata not found
Reading partition table from bootdisk...
Reading partition table from image...
Saving config files...
Commencing upgrade. Closing all shell sessions.

reboot

BusyBox v1.28.4 () built-in shell (ash)

  _______                     ________        __
 |       |.-----.-----.-----.|  |  |  |.----.|  |_
 |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
 |_______||   __|_____|__|__||________||__|  |____|
          |__| W I R E L E S S   F R E E D O M
 -----------------------------------------------------
 OpenWrt 18.06-SNAPSHOT, r7653+12-939fa07b04
 -----------------------------------------------------
root@ffc-halloTest:~# mount
/dev/root on /rom type squashfs (ro,relatime)
proc on /proc type proc (rw,nosuid,nodev,noexec,noatime)
sysfs on /sys type sysfs (rw,nosuid,nodev,noexec,noatime)
tmpfs on /tmp type tmpfs (rw,nosuid,nodev,noatime)
/dev/loop0 on /overlay type f2fs (rw,lazytime,noatime,background_gc=on,no_heap,user_xattr,inline_xattr,inline_data,inline_dentry,flush_merge,extent_cache,mode=adaptive,active_logs=6)
overlayfs:/overlay on / type overlay (rw,noatime,lowerdir=/,upperdir=/overlay/upper,workdir=/overlay/work)
/dev/sda1 on /boot type ext4 (rw,noatime,block_validity,delalloc,barrier,user_xattr)
/dev/sda1 on /boot type ext4 (rw,noatime,block_validity,delalloc,barrier,user_xattr)
tmpfs on /dev type tmpfs (rw,nosuid,relatime,size=512k,mode=755)
devpts on /dev/pts type devpts (rw,nosuid,noexec,relatime,mode=600,ptmxmode=000)
debugfs on /sys/kernel/debug type debugfs (rw,noatime)
root@ffc-halloTest:~#

@rotanid
Copy link
Member

rotanid commented Jan 21, 2019

@txt-file looks good, maybe add at least one sentence to your comment via the edit function saying what you have done and what the result was

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0. type: enhancement The changeset is an enhancement
Projects
None yet
Development

Successfully merging a pull request may close this issue.

4 participants