Preservation/kaiten-yaki
1
0
Fork 0
mirror of https://github.com/suikan4github/kaiten-yaki.git synced 2025-12-20 02:21:17 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/6' into develop

Browse source
This commit is contained in:
Suikan 2021-07-04 16:20:13 +09:00
commit 0177674c79
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -6,11 +6,12 @@ Record of the modification in project development.
### Added ### Added
### Changed ### Changed
- [Issue 5 : OVERWRITEINSTALL confirmation is missing](https://github.com/suikan4github/kaiten-yaki/issues/5) - [Issue 5 : OVERWRITEINSTALL confirmation is missing](https://github.com/suikan4github/kaiten-yaki/issues/5)
- [Issue 6 : Remove loglevel dependency from the void-kaiten-yaki.sh ](https://github.com/suikan4github/kaiten-yaki/6)
### Deprecated ### Deprecated
### Removed ### Removed
### Fixed ### Fixed
### Security
### Known Issue ### Known Issue
## [1.0.0] - 2021-07-03 ## [1.0.0] - 2021-07-03

6
script/void-kaiten-yaki.sh
View file

@ -50,14 +50,14 @@ function main() {
else else
# Not yet. Let's add. # Not yet. Let's add.
echo "...Modify /etc/default/grub." echo "...Modify /etc/default/grub."
sed -i "s#loglevel=4#loglevel=4 ${GRUB_ADDITIONAL_PARAMETERS}#" /etc/default/grub sed -i -e "/GRUB_CMDLINE_LINUX_DEFAULT/{s#\"# ${GRUB_ADDITIONAL_PARAMETERS}\"#2}" /etc/default/grub
fi fi
# Common part of the pre-install stage # Common part of the pre-install stage
if ! pre_install ; then if ! pre_install ; then
# If error, restore the modification.
echo "...restoring modified /etc/default/grub." echo "...restoring modified /etc/default/grub."
sed -i "s#loglevel=4 ${GRUB_ADDITIONAL_PARAMETERS}#loglevel=4#" /etc/default/grub sed -i -e "s#loglevel=4 ${GRUB_ADDITIONAL_PARAMETERS}#loglevel=4#" /etc/default/grub
return 1 # with error status return 1 # with error status
fi fi