Skip to content

Commit

Permalink
Updated example configuration files:
Browse files Browse the repository at this point in the history
mkinitcpio.conf.example now has btrfs ext2 overlay in modules array
syslinux.cfg.example is not marked executable
  • Loading branch information
bluerider committed Mar 18, 2015
1 parent 0fc8952 commit fb49753
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion examples/mkinitcpio.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
# run. Advanced users may wish to specify all system modules
# in this array. For instance:
# MODULES="piix ide_disk reiserfs"
MODULES="zram"
<<<<<<< HEAD
MODULES="zram ext2 btrfs overlay"
=======
MODULES="i915"
>>>>>>> parent of 592c2b3... Removed i915 from modules array (it isn't necssary). Added zram to modules array so initrd will be built with it.

# BINARIES
# This setting includes any additional binaries a given user may
Expand Down
Empty file modified examples/syslinux.cfg.example
100755 → 100644
Empty file.

1 comment on commit fb49753

@alphaniner
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like something went wrong with this commit.

Please sign in to comment.