| @@ -26,9 +26,14 if [ "$ENABLE_CRYPTFS" = true ] ; then | |||||
| 26 | # Add encrypted partition to crypttab and fstab |
|
26 | # Add encrypted partition to crypttab and fstab | |
| 27 | install_readonly files/mount/crypttab "${ETC_DIR}/crypttab" |
|
27 | install_readonly files/mount/crypttab "${ETC_DIR}/crypttab" | |
| 28 | echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks" >> "${ETC_DIR}/crypttab" |
|
28 | echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks" >> "${ETC_DIR}/crypttab" | |
|
|
29 | ||||
|
|
30 | if [ "$ENABLE_USBBOOT" = true ] ; then | |||
|
|
31 | # Add usb/sda2 disk to crypttab | |||
|
|
32 | sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab" | |||
|
|
33 | fi | |||
| 29 |
|
34 | |||
| 30 | if [ "$ENABLE_SPLITFS" = true ] ; then |
|
35 | if [ "$ENABLE_SPLITFS" = true ] ; then | |
| 31 | # Add usb/sda disk to crypttab |
|
36 | # Add usb/sda1 disk to crypttab | |
| 32 | sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/crypttab" |
|
37 | sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/crypttab" | |
| 33 | fi |
|
38 | fi | |
| 34 | fi |
|
39 | fi | |
| @@ -55,12 +55,12 fi | |||||
| 55 |
|
55 | |||
| 56 | # Setup firmware boot cmdline |
|
56 | # Setup firmware boot cmdline | |
| 57 | if [ "$ENABLE_USBBOOT" = true ] ; then |
|
57 | if [ "$ENABLE_USBBOOT" = true ] ; then | |
| 58 | CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait init=/bin/systemd" |
|
58 | CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline console=tty1 rootwait init=/bin/systemd" | |
| 59 | else |
|
59 | else | |
| 60 | if [ "$ENABLE_SPLITFS" = true ] ; then |
|
60 | if [ "$ENABLE_SPLITFS" = true ] ; then | |
| 61 | CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait init=/bin/systemd" |
|
61 | CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline console=tty1 rootwait init=/bin/systemd" | |
| 62 | else |
|
62 | else | |
| 63 | CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait init=/bin/systemd" |
|
63 | CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline console=tty1 rootwait init=/bin/systemd" | |
| 64 | fi |
|
64 | fi | |
| 65 | fi |
|
65 | fi | |
| 66 |
|
66 | |||
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
